Fix more remaining FilePath -> base::FilePath.

This removes the "using" in file_path.h for Mac since Mac now passes trybots with no using. It still leaves the using for Windows.

Review URL: https://codereview.chromium.org/12294008

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@183066 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 11 insertions, 11 deletions

diff --git a/cloud_print/service/win/chrome_launcher.cc b/cloud_print/service/win/chrome_launcher.cc
index 5df9bae..2fafe6f 100644
--- a/cloud_print/service/win/chrome_launcher.cc
+++ b/cloud_print/service/win/chrome_launcher.cc
@@ -51,7 +51,7 @@ bool LaunchProcess(const CommandLine& cmdline,
 
 }  // namespace
 
-ChromeLauncher::ChromeLauncher(const FilePath& user_data)
+ChromeLauncher::ChromeLauncher(const base::FilePath& user_data)
     : stop_event_(true, true),
       user_data_(user_data) {
 }
@@ -78,7 +78,7 @@ void ChromeLauncher::Run() {
 
   for (base::TimeDelta time_out = default_time_out;;
        time_out = std::min(time_out * 2, max_time_out)) {
-    FilePath chrome_path = chrome_launcher_support::GetAnyChromePath();
+    base::FilePath chrome_path = chrome_launcher_support::GetAnyChromePath();
 
     if (!chrome_path.empty()) {
       CommandLine cmd(chrome_path);
diff --git a/cloud_print/service/win/chrome_launcher.h b/cloud_print/service/win/chrome_launcher.h
index bc257ff..322e21f 100644
--- a/cloud_print/service/win/chrome_launcher.h
+++ b/cloud_print/service/win/chrome_launcher.h
@@ -14,7 +14,7 @@
 
 class ChromeLauncher : public base::DelegateSimpleThread::Delegate {
  public:
-  explicit ChromeLauncher(const FilePath& user_data);
+  explicit ChromeLauncher(const base::FilePath& user_data);
 
   virtual ~ChromeLauncher();
 
@@ -24,7 +24,7 @@ class ChromeLauncher : public base::DelegateSimpleThread::Delegate {
   virtual void Run() OVERRIDE;
 
  private:
-  FilePath user_data_;
+  base::FilePath user_data_;
   base::WaitableEvent stop_event_;
   scoped_ptr<base::DelegateSimpleThread> thread_;
 
diff --git a/cloud_print/service/win/cloud_print_service.cc b/cloud_print/service/win/cloud_print_service.cc
index 3d1e7f0..b4a2ae6 100644
--- a/cloud_print/service/win/cloud_print_service.cc
+++ b/cloud_print/service/win/cloud_print_service.cc
@@ -68,7 +68,7 @@ HRESULT HResultFromLastError() {
 }
 
 void InvalidUsage() {
-  FilePath service_path;
+  base::FilePath service_path;
   CHECK(PathService::Get(base::FILE_EXE, &service_path));
 
   std::cout << "Usage: ";
@@ -193,7 +193,7 @@ class CloudPrintServiceModule
     if (FAILED(hr))
       return hr;
 
-    FilePath service_path;
+    base::FilePath service_path;
     CHECK(PathService::Get(base::FILE_EXE, &service_path));
     CommandLine command_line(service_path);
     command_line.AppendSwitch(run_switch);
@@ -346,7 +346,7 @@ class CloudPrintServiceModule
                                            WideToASCII(*run_as_user), false));
       *run_as_password = ASCIIToWide(GetOption("Password", "", true));
 
-      FilePath requirements_filename(user_data_dir_);
+      base::FilePath requirements_filename(user_data_dir_);
       requirements_filename =
           requirements_filename.Append(kRequirementsFileName);
 
@@ -389,7 +389,7 @@ class CloudPrintServiceModule
   }
 
   HRESULT SetupServiceState() {
-    FilePath file = user_data_dir_.Append(kServiceStateFileName);
+    base::FilePath file = user_data_dir_.Append(kServiceStateFileName);
 
     for (;;) {
       std::string contents;
@@ -492,7 +492,7 @@ class CloudPrintServiceModule
   }
 
   HRESULT CheckRequirements() {
-    FilePath requirements_filename(user_data_dir_);
+    base::FilePath requirements_filename(user_data_dir_);
     requirements_filename = requirements_filename.Append(kRequirementsFileName);
     std::string output;
     output.append("Printers available for " +
@@ -506,7 +506,7 @@ class CloudPrintServiceModule
       output += printer_list[i].printer_name;
       output += "\n";
     }
-    FilePath chrome = chrome_launcher_support::GetAnyChromePath();
+    base::FilePath chrome = chrome_launcher_support::GetAnyChromePath();
     output.append(chrome.empty() ? kChromeIsNotAvalible : kChromeIsAvalible);
     file_util::WriteFile(requirements_filename, output.c_str(), output.size());
     return S_OK;
@@ -527,7 +527,7 @@ class CloudPrintServiceModule
   static BOOL WINAPI ConsoleCtrlHandler(DWORD type);
 
   bool check_requirements_;
-  FilePath user_data_dir_;
+  base::FilePath user_data_dir_;
   scoped_ptr<ChromeLauncher> chrome_;
 };