Add explicit base to FilePath.

content/shell/shell_browser_main.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/shell/shell_browser_main.h"
 
 #include <iostream>
 
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/sys_string_conversions.h"
 #include "base/threading/thread_restrictions.h"
 #include "base/utf_string_conversions.h"
 #include "content/public/browser/browser_main_runner.h"
 #include "content/shell/shell_switches.h"
 #include "content/shell/webkit_test_controller.h"
 #include "net/base/net_util.h"
 #include "webkit/support/webkit_support.h"
 
 namespace {
 
 GURL GetURLForLayoutTest(const std::string& test_name,
-                         FilePath* current_working_directory,
+                         base::FilePath* current_working_directory,
                          bool* enable_pixel_dumping,
                          std::string* expected_pixel_hash) {
   // A test name is formated like file:///path/to/test'--pixel-test'pixelhash
   std::string path_or_url = test_name;
   std::string pixel_switch;
   std::string pixel_hash;
   std::string::size_type separator_position = path_or_url.find('\'');
   if (separator_position != std::string::npos) {
     pixel_switch = path_or_url.substr(separator_position + 1);
     path_or_url.erase(separator_position);
   }
   separator_position = pixel_switch.find('\'');
   if (separator_position != std::string::npos) {
     pixel_hash = pixel_switch.substr(separator_position + 1);
     pixel_switch.erase(separator_position);
   }
   if (enable_pixel_dumping) {
     *enable_pixel_dumping =
         (pixel_switch == "--pixel-test" || pixel_switch == "-p");
   }
   if (expected_pixel_hash)
     *expected_pixel_hash = pixel_hash;
   GURL test_url(path_or_url);
   if (!(test_url.is_valid() && test_url.has_scheme())) {
     // We're outside of the message loop here, and this is a test.
     base::ThreadRestrictions::ScopedAllowIO allow_io;
 #if defined(OS_WIN)
     std::wstring wide_path_or_url =
         base::SysNativeMBToWide(path_or_url);
-    FilePath local_file(wide_path_or_url);
+    base::FilePath local_file(wide_path_or_url);
 #else
-    FilePath local_file(path_or_url);
+    base::FilePath local_file(path_or_url);
 #endif
     file_util::AbsolutePath(&local_file);
     test_url = net::FilePathToFileURL(local_file);
   }
-  FilePath local_path;
+  base::FilePath local_path;
   if (current_working_directory) {
     // We're outside of the message loop here, and this is a test.
     base::ThreadRestrictions::ScopedAllowIO allow_io;
     if (net::FileURLToFilePath(test_url, &local_path))
       *current_working_directory = local_path.DirName();
     else
       file_util::GetCurrentDirectory(current_working_directory);
   }
   return test_url;
 }
@@ skipping 59 matching lines @@
 #endif
 
     while (GetNextTest(args, &command_line_position, &test_string)) {
       if (test_string.empty())
         continue;
       if (test_string == "QUIT")
         break;
 
       bool enable_pixel_dumps;
       std::string pixel_hash;
-      FilePath cwd;
+      base::FilePath cwd;
       GURL test_url = GetURLForLayoutTest(
           test_string, &cwd, &enable_pixel_dumps, &pixel_hash);
       if (!content::WebKitTestController::Get()->PrepareForLayoutTest(
               test_url, cwd, enable_pixel_dumps, pixel_hash)) {
         break;
       }
 
       ran_at_least_once = true;
       main_runner_->Run();
 
       if (!content::WebKitTestController::Get()->ResetAfterLayoutTest())
         break;
     }
     if (!ran_at_least_once) {
       MessageLoop::current()->PostTask(FROM_HERE, MessageLoop::QuitClosure());
       main_runner_->Run();
     }
     exit_code = 0;
   } else {
     exit_code = main_runner_->Run();
   }
 
   main_runner_->Shutdown();
 
   return exit_code;
 }