Add FilePath to base namespace.

webkit/support/webkit_support.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 "webkit/support/webkit_support.h"
 
 #include "base/at_exit.h"
 #include "base/base64.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 105 matching lines @@
     // http://blogs.msdn.com/oldnewthing/archive/2004/07/27/198410.aspx
     UINT existing_flags = SetErrorMode(new_flags);
     SetErrorMode(existing_flags | new_flags);
   }
 #endif
 
 #if defined(OS_ANDROID)
   // On Android we expect the log to appear in logcat.
   base::InitAndroidTestLogging();
 #else
-  FilePath log_filename;
+  base::FilePath log_filename;
   PathService::Get(base::DIR_EXE, &log_filename);
   log_filename = log_filename.AppendASCII("DumpRenderTree.log");
   logging::InitLogging(
       log_filename.value().c_str(),
       // Only log to a file. This prevents debugging output from disrupting
       // whether or not we pass.
       logging::LOG_ONLY_TO_FILE,
       // We might have multiple DumpRenderTree processes going at once.
       logging::LOCK_LOG_FILE,
       logging::DELETE_OLD_LOG_FILE,
@@ skipping 71 matching lines @@
   WebKit::WebThemeEngine* theme_engine() const {
     return webkit_platform_support_->themeEngine();
   }
 #endif
 
 #if defined(OS_ANDROID)
   // On Android under layout test mode, we mock the current directory
   // in SetCurrentDirectoryForFileURL() and GetAbsoluteWebStringFromUTF8Path(),
   // as the directory might not exist on the device because we are using
   // file-over-http bridge.
-  void set_mock_current_directory(const FilePath& directory) {
+  void set_mock_current_directory(const base::FilePath& directory) {
     mock_current_directory_ = directory;
   }
 
-  FilePath mock_current_directory() const {
+  base::FilePath mock_current_directory() const {
     return mock_current_directory_;
   }
 
   webkit_media::WebMediaPlayerManagerAndroid* media_player_manager() {
     return media_player_manager_.get();
   }
 
   webkit_media::MediaPlayerBridgeManagerImpl* media_bridge_manager() {
     return media_bridge_manager_.get();
   }
 #endif
 
  private:
   // Data member at_exit_manager_ will take the ownership of the input
   // AtExitManager and manage its lifecycle.
   scoped_ptr<base::AtExitManager> at_exit_manager_;
   scoped_ptr<MessageLoopType> main_message_loop_;
   scoped_ptr<TestWebKitPlatformSupport> webkit_platform_support_;
 
 #if defined(OS_ANDROID)
-  FilePath mock_current_directory_;
+  base::FilePath mock_current_directory_;
   scoped_ptr<webkit_media::WebMediaPlayerManagerAndroid> media_player_manager_;
   scoped_ptr<webkit_media::MediaPlayerBridgeManagerImpl> media_bridge_manager_;
 #endif
 };
 
 class WebPluginImplWithPageDelegate
     : public webkit_support::TestWebPluginPageDelegate,
       public base::SupportsWeakPtr<WebPluginImplWithPageDelegate>,
       public webkit::npapi::WebPluginImpl {
  public:
   WebPluginImplWithPageDelegate(WebFrame* frame,
                                 const WebPluginParams& params,
-                                const FilePath& path)
+                                const base::FilePath& path)
       : webkit_support::TestWebPluginPageDelegate(),
         webkit::npapi::WebPluginImpl(frame, params, path, AsWeakPtr()) {}
   virtual ~WebPluginImplWithPageDelegate() {}
  private:
   DISALLOW_COPY_AND_ASSIGN(WebPluginImplWithPageDelegate);
 };
 
-FilePath GetWebKitRootDirFilePath() {
-  FilePath basePath;
+base::FilePath GetWebKitRootDirFilePath() {
+  base::FilePath basePath;
   PathService::Get(base::DIR_SOURCE_ROOT, &basePath);
   if (file_util::PathExists(
           basePath.Append(FILE_PATH_LITERAL("third_party/WebKit")))) {
     // We're in a WebKit-in-chrome checkout.
     basePath = basePath.Append(FILE_PATH_LITERAL("third_party/WebKit"));
   } else if (file_util::PathExists(
           basePath.Append(FILE_PATH_LITERAL("chromium")))) {
     // We're in a WebKit-only checkout on Windows.
     basePath = basePath.Append(FILE_PATH_LITERAL("../.."));
   } else if (file_util::PathExists(
@@ skipping 70 matching lines @@
     icu_util::Initialize();
   }
   webkit_glue::SetUserAgent(webkit_glue::BuildUserAgentFromProduct(
       "DumpRenderTree/0.0.0.0"), false);
 }
 
 }  // namespace
 
 namespace webkit_support {
 
-FilePath GetChromiumRootDirFilePath() {
-  FilePath basePath;
+base::FilePath GetChromiumRootDirFilePath() {
+  base::FilePath basePath;
   PathService::Get(base::DIR_SOURCE_ROOT, &basePath);
   if (file_util::PathExists(
           basePath.Append(FILE_PATH_LITERAL("third_party/WebKit")))) {
     // We're in a WebKit-in-chrome checkout.
     return basePath;
   }
   return GetWebKitRootDirFilePath()
          .Append(FILE_PATH_LITERAL("Source/WebKit/chromium"));
 }
 
@@ skipping 105 matching lines @@
 WebKit::WebApplicationCacheHost* CreateApplicationCacheHost(
     WebFrame*, WebKit::WebApplicationCacheHostClient* client) {
   return SimpleAppCacheSystem::CreateApplicationCacheHost(client);
 }
 
 WebKit::WebStorageNamespace* CreateSessionStorageNamespace(unsigned quota) {
   return SimpleDomStorageSystem::instance().CreateSessionStorageNamespace();
 }
 
 WebKit::WebString GetWebKitRootDir() {
-  FilePath path = GetWebKitRootDirFilePath();
+  base::FilePath path = GetWebKitRootDirFilePath();
   std::string path_ascii = path.MaybeAsASCII();
   CHECK(!path_ascii.empty());
   return WebKit::WebString::fromUTF8(path_ascii.c_str());
 }
 
 void SetUpGLBindings(GLBindingPreferences bindingPref) {
   switch (bindingPref) {
     case GL_BINDING_DEFAULT:
       gfx::GLSurface::InitializeOneOff();
       break;
@@ skipping 118 matching lines @@
   MessageLoop::current()->PostDelayedTask(
       FROM_HERE,
       base::Bind(&TaskAdaptor::Run, base::Owned(task)),
       base::TimeDelta::FromMilliseconds(delay_ms));
 }
 
 // Wrappers for FilePath and file_util
 
 WebString GetAbsoluteWebStringFromUTF8Path(const std::string& utf8_path) {
 #if defined(OS_WIN)
-  FilePath path(UTF8ToWide(utf8_path));
+  base::FilePath path(UTF8ToWide(utf8_path));
   file_util::AbsolutePath(&path);
   return WebString(path.value());
 #else
-  FilePath path(base::SysWideToNativeMB(base::SysUTF8ToWide(utf8_path)));
+  base::FilePath path(base::SysWideToNativeMB(base::SysUTF8ToWide(utf8_path)));
 #if defined(OS_ANDROID)
   if (WebKit::layoutTestMode()) {
     // See comment of TestEnvironment::set_mock_current_directory().
     if (!path.IsAbsolute()) {
       // Not using FilePath::Append() because it can't handle '..' in path.
       DCHECK(test_environment);
       GURL base_url = net::FilePathToFileURL(
           test_environment->mock_current_directory()
               .Append(FILE_PATH_LITERAL("foo")));
       net::FileURLToFilePath(base_url.Resolve(path.value()), &path);
@@ skipping 11 matching lines @@
 WebURL CreateURLForPathOrURL(const std::string& path_or_url_in_nativemb) {
   // NativeMB to UTF-8
   std::wstring wide_path_or_url
       = base::SysNativeMBToWide(path_or_url_in_nativemb);
   std::string path_or_url_in_utf8 = WideToUTF8(wide_path_or_url);
 
   GURL url(path_or_url_in_utf8);
   if (url.is_valid() && url.has_scheme())
     return WebURL(url);
 #if defined(OS_WIN)
-  FilePath path(wide_path_or_url);
+  base::FilePath path(wide_path_or_url);
 #else
-  FilePath path(path_or_url_in_nativemb);
+  base::FilePath path(path_or_url_in_nativemb);
 #endif
   file_util::AbsolutePath(&path);
   return net::FilePathToFileURL(path);
 }
 
 WebURL 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 replacePath =
+  base::FilePath replacePath =
       GetWebKitRootDirFilePath().Append(FILE_PATH_LITERAL("LayoutTests/"));
 
   // On Android, the file is actually accessed through file-over-http. Disable
   // the following CHECK because the file is unlikely to exist on the device.
 #if !defined(OS_ANDROID)
   CHECK(file_util::PathExists(replacePath)) << replacePath.value() <<
       " (re-written from " << utf8_url << ") does not exit";
 #endif
 
 #if defined(OS_WIN)
   std::string utf8_path = WideToUTF8(replacePath.value());
 #else
   std::string utf8_path
       = WideToUTF8(base::SysNativeMBToWide(replacePath.value()));
 #endif
   std::string newUrl = std::string("file://") + utf8_path
       + utf8_url.substr(kPrefixLen);
   return WebURL(GURL(newUrl));
 }
 
 bool SetCurrentDirectoryForFileURL(const WebKit::WebURL& fileUrl) {
-  FilePath local_path;
+  base::FilePath local_path;
   if (!net::FileURLToFilePath(fileUrl, &local_path))
     return false;
 #if defined(OS_ANDROID)
   if (WebKit::layoutTestMode()) {
     // See comment of TestEnvironment::set_mock_current_directory().
     DCHECK(test_environment);
-    FilePath directory = local_path.DirName();
+    base::FilePath directory = local_path.DirName();
     test_environment->set_mock_current_directory(directory);
     // Still try to actually change the directory, but ignore any error.
     // For a few tests that need to access resources directly as files
     // (e.g. blob tests) we still push the resources and need to chdir there.
     file_util::SetCurrentDirectory(directory);
     return true;
   }
 #endif
   return file_util::SetCurrentDirectory(local_path.DirName());
 }
 
 WebURL LocalFileToDataURL(const WebURL& fileUrl) {
-  FilePath local_path;
+  base::FilePath local_path;
   if (!net::FileURLToFilePath(fileUrl, &local_path))
     return WebURL();
 
   std::string contents;
   if (!file_util::ReadFileToString(local_path, &contents))
     return WebURL();
 
   std::string contents_base64;
   if (!base::Base64Encode(contents, &contents_base64))
     return WebURL();
@@ skipping 101 matching lines @@
 
 WebKit::WebThemeEngine* GetThemeEngine() {
   DCHECK(test_environment);
   return test_environment->theme_engine();
 }
 
 #endif
 
 // DevTools frontend path for inspector LayoutTests.
 WebURL GetDevToolsPathAsURL() {
-  FilePath dirExe;
+  base::FilePath dirExe;
   if (!PathService::Get(base::DIR_EXE, &dirExe)) {
       DCHECK(false);
       return WebURL();
   }
 #if defined(OS_MACOSX)
   dirExe = dirExe.AppendASCII("../../..");
 #endif
-  FilePath devToolsPath = dirExe.AppendASCII(
+  base::FilePath devToolsPath = dirExe.AppendASCII(
       "resources/inspector/devtools.html");
   return net::FilePathToFileURL(devToolsPath);
 }
 
 // FileSystem
 void OpenFileSystem(WebFrame* frame, WebFileSystem::Type type,
     long long size, bool create, WebFileSystemCallbacks* callbacks) {
   SimpleFileSystem* fileSystem = static_cast<SimpleFileSystem*>(
       test_environment->webkit_platform_support()->fileSystem());
   fileSystem->OpenFileSystem(frame, type, size, create, callbacks);
 }
 
 void DeleteFileSystem(WebFrame* frame, WebFileSystem::Type type,
                       WebFileSystemCallbacks* callbacks) {
   SimpleFileSystem* fileSystem = static_cast<SimpleFileSystem*>(
       test_environment->webkit_platform_support()->fileSystem());
   fileSystem->DeleteFileSystem(frame, type, callbacks);
 }
 
 WebKit::WebString RegisterIsolatedFileSystem(
     const WebKit::WebVector<WebKit::WebString>& filenames) {
   fileapi::IsolatedContext::FileInfoSet files;
   for (size_t i = 0; i < filenames.size(); ++i) {
-    FilePath path = webkit_base::WebStringToFilePath(filenames[i]);
+    base::FilePath path = webkit_base::WebStringToFilePath(filenames[i]);
     files.AddPath(path, NULL);
   }
   std::string filesystemId =
       fileapi::IsolatedContext::GetInstance()->RegisterDraggedFileSystem(files);
   return UTF8ToUTF16(filesystemId);
 }
 
 // Keyboard code
 #if defined(TOOLKIT_GTK)
 int NativeKeyCodeForWindowsKeyCode(int keycode, bool shift) {
@@ skipping 10 matching lines @@
 // Logging
 void EnableWebCoreLogChannels(const std::string& channels) {
   webkit_glue::EnableWebCoreLogChannels(channels);
 }
 
 void SetGamepadData(const WebKit::WebGamepads& pads) {
   test_environment->webkit_platform_support()->setGamepadData(pads);
 }
 
 }  // namespace webkit_support