Add explicit base to FilePath.

content/shell/webkit_test_runner.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/webkit_test_runner.h"
 
 #include <cmath>
 
 #include "base/base64.h"
 #include "base/md5.h"
@@ skipping 198 matching lines @@
 
 void WebKitTestRunner::postDelayedTask(WebTask* task, long long ms) {
   MessageLoop::current()->PostDelayedTask(
       FROM_HERE,
       base::Bind(&WebTask::run, base::Owned(task)),
       base::TimeDelta::FromMilliseconds(ms));
 }
 
 WebString WebKitTestRunner::registerIsolatedFileSystem(
     const WebKit::WebVector<WebKit::WebString>& absolute_filenames) {
-  std::vector<FilePath> files;
+  std::vector<base::FilePath> files;
   for (size_t i = 0; i < absolute_filenames.size(); ++i)
     files.push_back(webkit_base::WebStringToFilePath(absolute_filenames[i]));
   std::string filesystem_id;
   Send(new ShellViewHostMsg_RegisterIsolatedFileSystem(
       routing_id(), files, &filesystem_id));
   return WebString::fromUTF8(filesystem_id);
 }
 
 long long WebKitTestRunner::getCurrentTimeInMillisecond() {
     return base::TimeTicks::Now().ToInternalValue() /
         base::Time::kMicrosecondsPerMillisecond;
 }
 
 WebString WebKitTestRunner::getAbsoluteWebStringFromUTF8Path(
     const std::string& utf8_path) {
 #if defined(OS_WIN)
-  FilePath path(UTF8ToWide(utf8_path));
+  base::FilePath path(UTF8ToWide(utf8_path));
 #else
-  FilePath path(base::SysWideToNativeMB(base::SysUTF8ToWide(utf8_path)));
+  base::FilePath path(base::SysWideToNativeMB(base::SysUTF8ToWide(utf8_path)));
 #endif
   if (!path.IsAbsolute()) {
     GURL base_url =
         net::FilePathToFileURL(current_working_directory_.Append(
             FILE_PATH_LITERAL("foo")));
     net::FileURLToFilePath(base_url.Resolve(utf8_path), &path);
   }
   return webkit_base::FilePathToWebString(path);
 }
 
 WebURL WebKitTestRunner::localFileToDataURL(const WebURL& file_url) {
-  FilePath local_path;
+  base::FilePath local_path;
   if (!net::FileURLToFilePath(file_url, &local_path))
     return WebURL();
 
   std::string contents;
   Send(new ShellViewHostMsg_ReadFileToString(
         routing_id(), local_path, &contents));
 
   std::string contents_base64;
   if (!base::Base64Encode(contents, &contents_base64))
     return WebURL();
 
   const char data_url_prefix[] = "data:text/css:charset=utf-8;base64,";
   return WebURL(GURL(data_url_prefix + contents_base64));
 }
 
 WebURL WebKitTestRunner::rewriteLayoutTestsURL(const std::string& utf8_url) {
   const char kPrefix[] = "file:///tmp/LayoutTests/";
   const int kPrefixLen = arraysize(kPrefix) - 1;
 
   if (utf8_url.compare(0, kPrefixLen, kPrefix, kPrefixLen))
     return WebURL(GURL(utf8_url));
 
-  FilePath replace_path =
+  base::FilePath replace_path =
       ShellRenderProcessObserver::GetInstance()->webkit_source_dir().Append(
           FILE_PATH_LITERAL("LayoutTests/"));
 #if defined(OS_WIN)
   std::string utf8_path = WideToUTF8(replace_path.value());
 #else
   std::string utf8_path =
       WideToUTF8(base::SysNativeMBToWide(replace_path.value()));
 #endif
   std::string new_url =
       std::string("file://") + utf8_path + utf8_url.substr(kPrefixLen);
@@ skipping 324 matching lines @@
     SkBitmap empty_image;
     Send(new ShellViewHostMsg_ImageDump(
         routing_id(), actual_pixel_hash, empty_image));
     return;
   }
   Send(new ShellViewHostMsg_ImageDump(
       routing_id(), actual_pixel_hash, snapshot));
 }
 
 void WebKitTestRunner::OnSetCurrentWorkingDirectory(
-    const FilePath& current_working_directory) {
+    const base::FilePath& current_working_directory) {
   current_working_directory_ = current_working_directory;
-  std::vector<FilePath::StringType> components;
+  std::vector<base::FilePath::StringType> components;
   current_working_directory_.GetComponents(&components);
   for (unsigned i = 0; i < components.size(); ++i) {
     if (components[i] == FILE_PATH_LITERAL("loading"))
       dump_frame_load_callbacks_ = true;
   }
 }
 
 SkCanvas* WebKitTestRunner::GetCanvas() {
   WebView* view = render_view()->GetWebView();
   const WebSize& size = view->size();
@@ skipping 53 matching lines @@
     PaintRect(rect);
   }
   CHECK(proxy_->paintRect().isEmpty());
 }
 
 void WebKitTestRunner::DisplayRepaintMask() {
   GetCanvas()->drawARGB(167, 0, 0, 0);
 }
 
 }  // namespace content