commit 7dbb3d5cf0c15f500944d211057644d6a2f37371
author Ben Murdoch <benm@google.com> Wed Jul 17 14:55:54 2013 +0100
committer Ben Murdoch <benm@google.com> Wed Jul 17 14:55:54 2013 +0100
tree 701119ba0596f51b0ab466d6472b0f98211359c5
parent b2ecf4836a0eb284ddac7746b1f7ba613777a739

Merge from Chromium at DEPS revision r212014

This commit was generated by merge_to_master.py.

Change-Id: Ie0f261e9682cd8abea1eea1e51beab83d5eea21a

chrome_frame/chrome_tab.cc

diff --git a/chrome_frame/chrome_tab.cc b/chrome_frame/chrome_tab.cc
index a563ded..8728c95 100644
--- a/chrome_frame/chrome_tab.cc
+++ b/chrome_frame/chrome_tab.cc
@@ -42,8 +42,8 @@
 #include "chrome_frame/pin_module.h"
 #include "chrome_frame/resource.h"
 #include "chrome_frame/utils.h"
-#include "googleurl/src/url_util.h"
 #include "grit/chrome_frame_resources.h"
+#include "url/url_util.h"
 
 using base::win::RegKey;
 
@@ -344,12 +344,12 @@
   if (PathService::Get(base::FILE_MODULE, &module_path)) {
     module_path = module_path.DirName();
     helper_path = module_path.Append(kChromeFrameHelperExe);
-    if (!file_util::PathExists(helper_path)) {
+    if (!base::PathExists(helper_path)) {
       // If we can't find the helper in the current directory, try looking
       // one up (this is the layout in the build output folder).
       module_path = module_path.DirName();
       helper_path = module_path.Append(kChromeFrameHelperExe);
-      DCHECK(file_util::PathExists(helper_path)) <<
+      DCHECK(base::PathExists(helper_path)) <<
           "Could not find chrome_frame_helper.exe.";
     }
 
@@ -357,7 +357,7 @@
     HWND old_window = FindWindow(kChromeFrameHelperWindowClassName,
                                  kChromeFrameHelperWindowName);
 
-    if (file_util::PathExists(helper_path)) {
+    if (base::PathExists(helper_path)) {
       std::wstring helper_path_cmd(L"\"");
       helper_path_cmd += helper_path.value();
       helper_path_cmd += L"\" ";