Add FilePath to base namespace.

webkit/tools/test_shell/test_shell.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.
 
 #undef LOG
 
 #include "webkit/tools/test_shell/test_shell.h"
 
 #include "base/base_paths.h"
 #include "base/command_line.h"
@@ skipping 70 matching lines @@
 const int kSVGTestWindowWidth = 480;
 const int kSVGTestWindowHeight = 360;
 
 // URLRequestTestShellFileJob is used to serve the inspector
 class URLRequestTestShellFileJob : public net::URLRequestFileJob {
  public:
   static net::URLRequestJob* InspectorFactory(
       net::URLRequest* request,
       net::NetworkDelegate* network_delegate,
       const std::string& scheme) {
-    FilePath path;
+    base::FilePath path;
     PathService::Get(base::DIR_EXE, &path);
     path = path.AppendASCII("resources");
     path = path.AppendASCII("inspector");
     path = path.AppendASCII(request->url().path().substr(1));
     return new URLRequestTestShellFileJob(request, network_delegate, path);
   }
 
  private:
   URLRequestTestShellFileJob(net::URLRequest* request,
                              net::NetworkDelegate* network_delegate,
-                             const FilePath& path)
+                             const base::FilePath& path)
       : net::URLRequestFileJob(request, network_delegate, path) {
   }
   virtual ~URLRequestTestShellFileJob() { }
 
   DISALLOW_COPY_AND_ASSIGN(URLRequestTestShellFileJob);
 };
 
 
 }  // namespace
 
@@ skipping 143 matching lines @@
 #endif
 
     // Only log to a file if we're running layout tests. This prevents debugging
     // output from disrupting whether or not we pass.
     logging::LoggingDestination destination =
         logging::LOG_TO_BOTH_FILE_AND_SYSTEM_DEBUG_LOG;
     if (layout_test_mode)
       destination = logging::LOG_ONLY_TO_FILE;
 
     // We might have multiple test_shell processes going at once
-    FilePath log_filename;
+    base::FilePath log_filename;
     PathService::Get(base::DIR_EXE, &log_filename);
     log_filename = log_filename.AppendASCII("test_shell.log");
     logging::InitLogging(
         log_filename.value().c_str(),
         destination,
         logging::LOCK_LOG_FILE,
         logging::DELETE_OLD_LOG_FILE,
         logging::DISABLE_DCHECK_FOR_NON_OFFICIAL_RELEASE_BUILDS);
 
     // we want process and thread IDs because we may have multiple processes
@@ skipping 175 matching lines @@
 
   TestShell* new_win;
   if (!CreateNewWindow(GURL(), &new_win))
     return NULL;
 
   return new_win->webView();
 }
 
 void TestShell::ShowDevTools() {
   if (!devtools_shell_) {
-    FilePath dir_exe;
+    base::FilePath dir_exe;
     PathService::Get(base::DIR_EXE, &dir_exe);
-    FilePath devtools_path =
+    base::FilePath devtools_path =
         dir_exe.AppendASCII("resources/inspector/devtools.html");
     TestShell* devtools_shell;
     TestShell::CreateNewWindow(GURL(devtools_path.value()),
                                &devtools_shell);
     devtools_shell_ = devtools_shell->AsWeakPtr();
     devtools_shell_->CreateDevToolsClient(dev_tools_agent_.get());
   }
   DCHECK(devtools_shell_);
   devtools_shell_->Show(WebKit::WebNavigationPolicyNewWindow);
 }
@@ skipping 20 matching lines @@
   SizeTo(kTestWindowWidth, kTestWindowHeight);
 }
 
 void TestShell::ResetTestController() {
   notification_presenter_->Reset();
   delegate_->Reset();
   if (geolocation_client_mock_.get())
     geolocation_client_mock_->resetMock();
 }
 
-void TestShell::LoadFile(const FilePath& file) {
+void TestShell::LoadFile(const base::FilePath& file) {
   LoadURLForFrame(net::FilePathToFileURL(file), string16());
 }
 
 void TestShell::LoadURL(const GURL& url) {
   LoadURLForFrame(url, string16());
 }
 
 bool TestShell::Navigate(const TestNavigationEntry& entry, bool reload) {
   // Get the right target frame for the entry.
   WebFrame* frame = webView()->mainFrame();
@@ skipping 36 matching lines @@
   SetFocus(webViewHost(), true);
 
   return true;
 }
 
 void TestShell::GoBackOrForward(int offset) {
     navigation_controller_->GoToOffset(offset);
 }
 
 void TestShell::DumpDocumentText() {
-  FilePath file_path;
+  base::FilePath file_path;
   if (!PromptForSaveFile(L"Dump document text", &file_path))
       return;
 
   const std::string data =
       UTF16ToUTF8(webkit_glue::DumpDocumentText(webView()->mainFrame()));
   file_util::WriteFile(file_path, data.c_str(), data.length());
 }
 
 void TestShell::DumpRenderTree() {
-  FilePath file_path;
+  base::FilePath file_path;
   if (!PromptForSaveFile(L"Dump render tree", &file_path))
     return;
 
   const std::string data =
       UTF16ToUTF8(webkit_glue::DumpRenderer(webView()->mainFrame()));
   file_util::WriteFile(file_path, data.c_str(), data.length());
 }
 
 string16 TestShell::GetDocumentText() {
   return webkit_glue::DumpDocumentText(webView()->mainFrame());
@@ skipping 36 matching lines @@
   return device_orientation_client_mock_.get();
 }
 
 WebKit::WebGeolocationClientMock* TestShell::geolocation_client_mock() {
   if (!geolocation_client_mock_.get()) {
     geolocation_client_mock_.reset(
         WebKit::WebGeolocationClientMock::create());
   }
   return geolocation_client_mock_.get();
 }