1 files changed, 12 insertions, 11 deletions

diff --git a/chrome/browser/process_singleton_win.cc b/chrome/browser/process_singleton_win.cc
index d8073c1..62d3814 100644
--- a/chrome/browser/process_singleton_win.cc
+++ b/chrome/browser/process_singleton_win.cc
@@ -116,7 +116,7 @@ LRESULT CALLBACK ThunkWndProc(HWND hwnd, UINT message,
 
 bool ParseCommandLine(const COPYDATASTRUCT* cds,
                       CommandLine* parsed_command_line,
-                      FilePath* current_directory) {
+                      base::FilePath* current_directory) {
   // We should have enough room for the shortest command (min_message_size)
   // and also be a multiple of wchar_t bytes. The shortest command
   // possible is L"START\0\0" (empty current directory and command line).
@@ -154,7 +154,7 @@ bool ParseCommandLine(const COPYDATASTRUCT* cds,
     }
 
     // Get current directory.
-    *current_directory = FilePath(msg.substr(first_null + 1,
+    *current_directory = base::FilePath(msg.substr(first_null + 1,
                                              second_null - first_null));
 
     const std::wstring::size_type third_null =
@@ -175,7 +175,7 @@ bool ParseCommandLine(const COPYDATASTRUCT* cds,
 }
 
 bool ActivateMetroChrome() {
-  FilePath chrome_exe;
+  base::FilePath chrome_exe;
   if (!PathService::Get(base::FILE_EXE, &chrome_exe)) {
     NOTREACHED() << "Failed to get chrome exe path";
     return false;
@@ -219,7 +219,7 @@ bool ActivateMetroChrome() {
 // TODO(ananta)
 // Move this function to a common place as the Windows 8 delegate_execute
 // handler can possibly use this.
-bool ShouldLaunchInWindows8ImmersiveMode(const FilePath& user_data_dir) {
+bool ShouldLaunchInWindows8ImmersiveMode(const base::FilePath& user_data_dir) {
 #if defined(USE_AURA)
   return false;
 #endif
@@ -239,7 +239,7 @@ bool ShouldLaunchInWindows8ImmersiveMode(const FilePath& user_data_dir) {
   if (integrity_level == base::HIGH_INTEGRITY)
     return false;
 
-  FilePath default_user_data_dir;
+  base::FilePath default_user_data_dir;
   if (!chrome::GetDefaultUserDataDirectory(&default_user_data_dir))
     return false;
 
@@ -263,7 +263,8 @@ bool ShouldLaunchInWindows8ImmersiveMode(const FilePath& user_data_dir) {
 // So, if we detect the Softricity DLL we use WMI Win32_Process.Create to
 // break out of the virtualization environment.
 // http://code.google.com/p/chromium/issues/detail?id=43650
-bool ProcessSingleton::EscapeVirtualization(const FilePath& user_data_dir) {
+bool ProcessSingleton::EscapeVirtualization(
+    const base::FilePath& user_data_dir) {
   if (::GetModuleHandle(L"sftldr_wow64.dll") ||
       ::GetModuleHandle(L"sftldr.dll")) {
     int process_id;
@@ -290,7 +291,7 @@ bool ProcessSingleton::EscapeVirtualization(const FilePath& user_data_dir) {
   return false;
 }
 
-ProcessSingleton::ProcessSingleton(const FilePath& user_data_dir)
+ProcessSingleton::ProcessSingleton(const base::FilePath& user_data_dir)
     : window_(NULL), locked_(false), foreground_window_(NULL),
       is_virtualized_(false), lock_file_(INVALID_HANDLE_VALUE),
       user_data_dir_(user_data_dir) {
@@ -354,7 +355,7 @@ ProcessSingleton::NotifyResult ProcessSingleton::NotifyOtherProcess() {
   // Non-metro mode, send our command line to the other chrome message window.
   // format is "START\0<<<current directory>>>\0<<<commandline>>>".
   std::wstring to_send(L"START\0", 6);  // want the NULL in the string.
-  FilePath cur_dir;
+  base::FilePath cur_dir;
   if (!PathService::Get(base::DIR_CURRENT, &cur_dir))
     return PROCESS_NONE;
   to_send.append(cur_dir.value());
@@ -525,7 +526,7 @@ bool ProcessSingleton::Create(
     if (!remote_window_) {
       // We have to make sure there is no Chrome instance running on another
       // machine that uses the same profile.
-      FilePath lock_file_path = user_data_dir_.AppendASCII(kLockfile);
+      base::FilePath lock_file_path = user_data_dir_.AppendASCII(kLockfile);
       lock_file_ = CreateFile(lock_file_path.value().c_str(),
                               GENERIC_WRITE,
                               FILE_SHARE_READ,
@@ -592,7 +593,7 @@ LRESULT ProcessSingleton::OnCopyData(HWND hwnd, const COPYDATASTRUCT* cds) {
       // Read the command line and store it. It will be replayed when the
       // ProcessSingleton becomes unlocked.
       CommandLine parsed_command_line(CommandLine::NO_PROGRAM);
-      FilePath current_directory;
+      base::FilePath current_directory;
       if (ParseCommandLine(cds, &parsed_command_line, &current_directory))
         saved_startup_messages_.push_back(
             std::make_pair(parsed_command_line.argv(), current_directory));
@@ -602,7 +603,7 @@ LRESULT ProcessSingleton::OnCopyData(HWND hwnd, const COPYDATASTRUCT* cds) {
   }
 
   CommandLine parsed_command_line(CommandLine::NO_PROGRAM);
-  FilePath current_directory;
+  base::FilePath current_directory;
   if (!ParseCommandLine(cds, &parsed_command_line, &current_directory))
     return TRUE;
   return notification_callback_.Run(parsed_command_line, current_directory) ?