From 53b9d618311b878099c1939b034786ce6ae7f381 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Thu, 3 Sep 2015 20:07:29 +0800
Subject: [PATCH] Fix building on Windows

---
 atom/browser/net/asar/url_request_asar_job.cc                | 2 +-
 atom/browser/ui/file_dialog_win.cc                           | 2 +-
 chromium_src/chrome/browser/printing/pdf_to_emf_converter.cc | 3 +--
 chromium_src/chrome/common/chrome_utility_messages.h         | 2 +-
 script/lib/config.py                                         | 2 +-
 5 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/atom/browser/net/asar/url_request_asar_job.cc b/atom/browser/net/asar/url_request_asar_job.cc
index 88195a0d7..9b9a3c69d 100644
--- a/atom/browser/net/asar/url_request_asar_job.cc
+++ b/atom/browser/net/asar/url_request_asar_job.cc
@@ -172,7 +172,7 @@ bool URLRequestAsarJob::IsRedirectResponse(GURL* location,
 #if defined(OS_WIN)
   // Follow a Windows shortcut.
   // We just resolve .lnk file, ignore others.
-  if (!LowerCaseEqualsASCII(file_path_.Extension(), ".lnk"))
+  if (!base::LowerCaseEqualsASCII(file_path_.Extension(), ".lnk"))
     return false;
 
   base::FilePath new_path = file_path_;
diff --git a/atom/browser/ui/file_dialog_win.cc b/atom/browser/ui/file_dialog_win.cc
index 7fa68d521..b169471c6 100644
--- a/atom/browser/ui/file_dialog_win.cc
+++ b/atom/browser/ui/file_dialog_win.cc
@@ -252,7 +252,7 @@ bool ShowSaveDialog(atom::NativeWindow* parent_window,
 
     bool matched = false;
     for (size_t i = 0; i < filter.second.size(); ++i) {
-      if (EndsWith(file_name, filter.second[i], false)) {
+      if (base::EndsWith(file_name, filter.second[i], false)) {
         matched = true;
         break;;
       }
diff --git a/chromium_src/chrome/browser/printing/pdf_to_emf_converter.cc b/chromium_src/chrome/browser/printing/pdf_to_emf_converter.cc
index 89bac3b68..9064cd961 100644
--- a/chromium_src/chrome/browser/printing/pdf_to_emf_converter.cc
+++ b/chromium_src/chrome/browser/printing/pdf_to_emf_converter.cc
@@ -296,8 +296,7 @@ void PdfToEmfUtilityProcessHostClient::Start(
   // generate when sent to a metafile DC.
   utility_process_host_ =
       content::UtilityProcessHost::Create(
-          this, base::MessageLoop::current()->message_loop_proxy())
-          ->AsWeakPtr();
+          this, base::MessageLoop::current()->task_runner())->AsWeakPtr();
   if (!utility_process_host_)
     return OnFailed();
   // Should reply with OnProcessStarted().
diff --git a/chromium_src/chrome/common/chrome_utility_messages.h b/chromium_src/chrome/common/chrome_utility_messages.h
index 1de0756c0..f146e1823 100644
--- a/chromium_src/chrome/common/chrome_utility_messages.h
+++ b/chromium_src/chrome/common/chrome_utility_messages.h
@@ -27,7 +27,7 @@
 #if defined(OS_WIN)
 // A vector of filters, each being a Tuple containing a display string (i.e.
 // "Text Files") and a filter pattern (i.e. "*.txt").
-typedef std::vector<Tuple<base::string16, base::string16>>
+typedef std::vector<base::Tuple<base::string16, base::string16>>
     GetOpenFileNameFilter;
 #endif  // OS_WIN
 
diff --git a/script/lib/config.py b/script/lib/config.py
index 329282309..3fed12000 100644
--- a/script/lib/config.py
+++ b/script/lib/config.py
@@ -8,7 +8,7 @@ import sys
 
 BASE_URL = os.getenv('LIBCHROMIUMCONTENT_MIRROR') or \
     'http://github-janky-artifacts.s3.amazonaws.com/libchromiumcontent'
-LIBCHROMIUMCONTENT_COMMIT = '367552dc926aff4577e4743333922e7e6075c8e0'
+LIBCHROMIUMCONTENT_COMMIT = 'f5489a774b719e9e979675c17b99ed45a05aacf7'
 
 PLATFORM = {
   'cygwin': 'win32',