Replace FilePath with base::FilePath.

This is im preparation for removing the 'using" in file_path.h

Review URL: https://codereview.chromium.org/12286020

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@183021 0039d316-1c4b-4281-b951-d872f2087c98

13 files changed, 79 insertions, 73 deletions

diff --git a/webkit/blob/blob_storage_controller_unittest.cc b/webkit/blob/blob_storage_controller_unittest.cc
index ecd112b..9290f6a 100644
--- a/webkit/blob/blob_storage_controller_unittest.cc
+++ b/webkit/blob/blob_storage_controller_unittest.cc
@@ -21,22 +21,23 @@ TEST(BlobStorageControllerTest, RegisterBlobUrl) {
   scoped_refptr<BlobData> blob_data1(new BlobData());
   blob_data1->AppendData("Data1");
   blob_data1->AppendData("Data2");
-  blob_data1->AppendFile(FilePath(FILE_PATH_LITERAL("File1.txt")),
+  blob_data1->AppendFile(base::FilePath(FILE_PATH_LITERAL("File1.txt")),
     10, 1024, time1);
 
   scoped_refptr<BlobData> blob_data2(new BlobData());
   blob_data2->AppendData("Data3");
   blob_data2->AppendBlob(GURL("blob://url_1"), 8, 100);
-  blob_data2->AppendFile(FilePath(FILE_PATH_LITERAL("File2.txt")),
+  blob_data2->AppendFile(base::FilePath(FILE_PATH_LITERAL("File2.txt")),
       0, 20, time2);
 
   scoped_refptr<BlobData> canonicalized_blob_data2(new BlobData());
   canonicalized_blob_data2->AppendData("Data3");
   canonicalized_blob_data2->AppendData("a2___", 2);
-  canonicalized_blob_data2->AppendFile(FilePath(FILE_PATH_LITERAL("File1.txt")),
+  canonicalized_blob_data2->AppendFile(
+      base::FilePath(FILE_PATH_LITERAL("File1.txt")),
       10, 98, time1);
-  canonicalized_blob_data2->AppendFile(FilePath(FILE_PATH_LITERAL("File2.txt")),
-      0, 20, time2);
+  canonicalized_blob_data2->AppendFile(
+      base::FilePath(FILE_PATH_LITERAL("File2.txt")), 0, 20, time2);
 
   BlobStorageController blob_storage_controller;
 
diff --git a/webkit/database/database_quota_client_unittest.cc b/webkit/database/database_quota_client_unittest.cc
index 286347c..541f1e0 100644
--- a/webkit/database/database_quota_client_unittest.cc
+++ b/webkit/database/database_quota_client_unittest.cc
@@ -27,7 +27,7 @@ static const quota::StorageType kPerm = quota::kStorageTypePersistent;
 class MockDatabaseTracker : public DatabaseTracker {
  public:
   MockDatabaseTracker()
-      : DatabaseTracker(FilePath(), false, NULL, NULL, NULL),
+      : DatabaseTracker(base::FilePath(), false, NULL, NULL, NULL),
         delete_called_count_(0),
         async_delete_(false) {}
 
diff --git a/webkit/fileapi/file_system_util.cc b/webkit/fileapi/file_system_util.cc
index 24513d8..0960d0cb 100644
--- a/webkit/fileapi/file_system_util.cc
+++ b/webkit/fileapi/file_system_util.cc
@@ -25,8 +25,8 @@ const char kIsolatedDir[] = "/isolated";
 const char kExternalDir[] = "/external";
 const char kTestDir[] = "/test";
 
-const FilePath::CharType VirtualPath::kRoot[] = FILE_PATH_LITERAL("/");
-const FilePath::CharType VirtualPath::kSeparator = FILE_PATH_LITERAL('/');
+const base::FilePath::CharType VirtualPath::kRoot[] = FILE_PATH_LITERAL("/");
+const base::FilePath::CharType VirtualPath::kSeparator = FILE_PATH_LITERAL('/');
 
 // TODO(ericu): Consider removing support for '\', even on Windows, if possible.
 // There's a lot of test code that will need reworking, and we may have trouble
@@ -73,20 +73,21 @@ void VirtualPath::GetComponents(
       std::vector<base::FilePath::StringType>(ret_val.rbegin(), ret_val.rend());
 }
 
-FilePath::StringType VirtualPath::GetNormalizedFilePath(const FilePath& path) {
-  FilePath::StringType normalized_path = path.value();
-  const size_t num_separators = FilePath::StringType(
-      FilePath::kSeparators).length();
+base::FilePath::StringType VirtualPath::GetNormalizedFilePath(
+    const base::FilePath& path) {
+  base::FilePath::StringType normalized_path = path.value();
+  const size_t num_separators = base::FilePath::StringType(
+      base::FilePath::kSeparators).length();
   for (size_t i = 1; i < num_separators; ++i) {
     std::replace(normalized_path.begin(), normalized_path.end(),
-                 FilePath::kSeparators[i], kSeparator);
+                 base::FilePath::kSeparators[i], kSeparator);
   }
 
   return (IsAbsolute(normalized_path)) ?
-      normalized_path : FilePath::StringType(kRoot) + normalized_path;
+      normalized_path : base::FilePath::StringType(kRoot) + normalized_path;
 }
 
-bool VirtualPath::IsAbsolute(const FilePath::StringType& path) {
+bool VirtualPath::IsAbsolute(const base::FilePath::StringType& path) {
   return path.find(kRoot) == 0;
 }
 
diff --git a/webkit/fileapi/file_system_util.h b/webkit/fileapi/file_system_util.h
index ffefe57..60ac4c0 100644
--- a/webkit/fileapi/file_system_util.h
+++ b/webkit/fileapi/file_system_util.h
@@ -27,11 +27,11 @@ extern const char kTestDir[];
 
 class WEBKIT_STORAGE_EXPORT VirtualPath {
  public:
-  static const FilePath::CharType kRoot[];
-  static const FilePath::CharType kSeparator;
+  static const base::FilePath::CharType kRoot[];
+  static const base::FilePath::CharType kSeparator;
 
   // Use this instead of base::FilePath::BaseName when operating on virtual
-  // paths. base::FilePath::BaseName will get confused by ':' on Windows when it
+  // paths. FilePath::BaseName will get confused by ':' on Windows when it
   // looks like a drive letter separator; this will treat it as just another
   // character.
   static base::FilePath BaseName(const base::FilePath& virtual_path);
@@ -45,10 +45,11 @@ class WEBKIT_STORAGE_EXPORT VirtualPath {
 
   // Returns a path name ensuring that it begins with kRoot and all path
   // separators are forward slashes /.
-  static FilePath::StringType GetNormalizedFilePath(const FilePath& path);
+  static base::FilePath::StringType GetNormalizedFilePath(
+      const base::FilePath& path);
 
   // Returns true if the given path begins with kRoot.
-  static bool IsAbsolute(const FilePath::StringType& path);
+  static bool IsAbsolute(const base::FilePath::StringType& path);
 };
 
 // Returns the root URI of the filesystem that can be specified by a pair of
diff --git a/webkit/fileapi/file_system_util_unittest.cc b/webkit/fileapi/file_system_util_unittest.cc
index 3bf54fb..1b23d34 100644
--- a/webkit/fileapi/file_system_util_unittest.cc
+++ b/webkit/fileapi/file_system_util_unittest.cc
@@ -56,8 +56,8 @@ TEST_F(FileSystemUtilTest, VirtualPathBaseName) {
 
 TEST_F(FileSystemUtilTest, GetNormalizedFilePath) {
   struct test_data {
-    const FilePath::StringType path;
-    const FilePath::StringType normalized_path;
+    const base::FilePath::StringType path;
+    const base::FilePath::StringType normalized_path;
   } test_cases[] = {
     { FILE_PATH_LITERAL(""), FILE_PATH_LITERAL("/") },
     { FILE_PATH_LITERAL("/"), FILE_PATH_LITERAL("/") },
@@ -65,8 +65,8 @@ TEST_F(FileSystemUtilTest, GetNormalizedFilePath) {
     { FILE_PATH_LITERAL("/foo/bar"), FILE_PATH_LITERAL("/foo/bar") }
   };
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(test_cases); ++i) {
-    FilePath input = FilePath(test_cases[i].path);
-    FilePath::StringType normalized_path_string =
+    base::FilePath input = base::FilePath(test_cases[i].path);
+    base::FilePath::StringType normalized_path_string =
         VirtualPath::GetNormalizedFilePath(input);
     EXPECT_EQ(test_cases[i].normalized_path, normalized_path_string);
   }
diff --git a/webkit/fileapi/isolated_file_util_unittest.cc b/webkit/fileapi/isolated_file_util_unittest.cc
index faf83d7..1c67fb4 100644
--- a/webkit/fileapi/isolated_file_util_unittest.cc
+++ b/webkit/fileapi/isolated_file_util_unittest.cc
@@ -63,18 +63,18 @@ bool IsDirectoryEmpty(FileSystemContext* context, const FileSystemURL& url) {
 
 FileSystemURL GetEntryURL(FileSystemContext* file_system_context,
                           const FileSystemURL& dir,
-                          const FilePath::StringType& name) {
+                          const base::FilePath::StringType& name) {
   return file_system_context->CreateCrackedFileSystemURL(
       dir.origin(),
       dir.mount_type(),
       dir.virtual_path().Append(name));
 }
 
-FilePath GetRelativeVirtualPath(const FileSystemURL& root,
-                                const FileSystemURL& url) {
+base::FilePath GetRelativeVirtualPath(const FileSystemURL& root,
+                                      const FileSystemURL& url) {
   if (root.virtual_path().empty())
     return url.virtual_path();
-  FilePath relative;
+  base::FilePath relative;
   const bool success = root.virtual_path().AppendRelativePath(
       url.virtual_path(), &relative);
   DCHECK(success);
@@ -162,14 +162,14 @@ class IsolatedFileUtilTest : public testing::Test {
     return file_system_context()->CreateCrackedFileSystemURL(
         GURL("http://example.com"),
         kFileSystemTypeTemporary,
-        FilePath().AppendASCII("dest").Append(path));
+        base::FilePath().AppendASCII("dest").Append(path));
   }
 
   void VerifyFilesHaveSameContent(const FileSystemURL& url1,
                                   const FileSystemURL& url2) {
     // Get the file info for url1.
     base::PlatformFileInfo info1;
-    FilePath platform_path1;
+    base::FilePath platform_path1;
     ASSERT_EQ(base::PLATFORM_FILE_OK,
               AsyncFileTestHelper::GetMetadata(
                   file_system_context(), url1, &info1, &platform_path1));
diff --git a/webkit/fileapi/local_file_system_cross_operation_unittest.cc b/webkit/fileapi/local_file_system_cross_operation_unittest.cc
index 12c4ee4..2929b93 100644
--- a/webkit/fileapi/local_file_system_cross_operation_unittest.cc
+++ b/webkit/fileapi/local_file_system_cross_operation_unittest.cc
@@ -50,7 +50,7 @@ class CrossOperationTestHelper {
 
   void SetUp() {
     ASSERT_TRUE(base_.CreateUniqueTempDir());
-    FilePath base_dir = base_.path();
+    base::FilePath base_dir = base_.path();
     quota_manager_ = new quota::MockQuotaManager(
         false /* is_incognito */, base_dir,
         base::MessageLoopProxy::current(),
@@ -102,12 +102,12 @@ class CrossOperationTestHelper {
 
   FileSystemURL SourceURL(const std::string& path) {
     return file_system_context_->CreateCrackedFileSystemURL(
-        origin_, src_type_, FilePath::FromUTF8Unsafe(path));
+        origin_, src_type_, base::FilePath::FromUTF8Unsafe(path));
   }
 
   FileSystemURL DestURL(const std::string& path) {
     return file_system_context_->CreateCrackedFileSystemURL(
-        origin_, dest_type_, FilePath::FromUTF8Unsafe(path));
+        origin_, dest_type_, base::FilePath::FromUTF8Unsafe(path));
   }
 
   base::PlatformFileError Copy(const FileSystemURL& src,
@@ -146,10 +146,11 @@ class CrossOperationTestHelper {
       const FileSystemURL& root,
       const test::TestCaseRecord* const test_cases,
       size_t test_case_size) {
-    std::map<FilePath, const test::TestCaseRecord*> test_case_map;
+    std::map<base::FilePath, const test::TestCaseRecord*> test_case_map;
     for (size_t i = 0; i < test_case_size; ++i)
-      test_case_map[FilePath(test_cases[i].path).NormalizePathSeparators()] =
-          &test_cases[i];
+      test_case_map[
+          base::FilePath(test_cases[i].path).NormalizePathSeparators()] =
+              &test_cases[i];
 
     std::queue<FileSystemURL> directories;
     FileEntryList entries;
@@ -163,7 +164,7 @@ class CrossOperationTestHelper {
             dir.origin(),
             dir.mount_type(),
             dir.virtual_path().Append(entries[i].name));
-        FilePath relative;
+        base::FilePath relative;
         root.virtual_path().AppendRelativePath(url.virtual_path(), &relative);
         relative = relative.NormalizePathSeparators();
         ASSERT_TRUE(ContainsKey(test_case_map, relative));
diff --git a/webkit/fileapi/media/device_media_async_file_util.cc b/webkit/fileapi/media/device_media_async_file_util.cc
index fbd5ad1..550d5d8 100644
--- a/webkit/fileapi/media/device_media_async_file_util.cc
+++ b/webkit/fileapi/media/device_media_async_file_util.cc
@@ -316,7 +316,7 @@ void DeviceMediaAsyncFileUtil::OnCreateSnapshotFileError(
     const AsyncFileUtil::CreateSnapshotFileCallback& callback,
     base::PlatformFileError error) {
   if (!callback.is_null())
-    callback.Run(error, base::PlatformFileInfo(), FilePath(),
+    callback.Run(error, base::PlatformFileInfo(), base::FilePath(),
                  kSnapshotFileTemporary);
 }
 
diff --git a/webkit/fileapi/native_file_util_unittest.cc b/webkit/fileapi/native_file_util_unittest.cc
index e395a57..bf02f9d 100644
--- a/webkit/fileapi/native_file_util_unittest.cc
+++ b/webkit/fileapi/native_file_util_unittest.cc
@@ -19,20 +19,20 @@ class NativeFileUtilTest : public testing::Test {
   }
 
  protected:
-  FilePath Path() {
+  base::FilePath Path() {
     return data_dir_.path();
   }
 
-  FilePath Path(const char* file_name) {
+  base::FilePath Path(const char* file_name) {
     return data_dir_.path().AppendASCII(file_name);
   }
 
-  bool FileExists(const FilePath& path) {
+  bool FileExists(const base::FilePath& path) {
     return file_util::PathExists(path) &&
            !file_util::DirectoryExists(path);
   }
 
-  int64 GetSize(const FilePath& path) {
+  int64 GetSize(const base::FilePath& path) {
     base::PlatformFileInfo info;
     file_util::GetFileInfo(path, &info);
     return info.size;
@@ -45,7 +45,7 @@ class NativeFileUtilTest : public testing::Test {
 };
 
 TEST_F(NativeFileUtilTest, CreateCloseAndDeleteFile) {
-  FilePath file_name = Path("test_file");
+  base::FilePath file_name = Path("test_file");
   base::PlatformFile file_handle;
   bool created = false;
   int flags = base::PLATFORM_FILE_WRITE | base::PLATFORM_FILE_ASYNC;
@@ -76,7 +76,7 @@ TEST_F(NativeFileUtilTest, CreateCloseAndDeleteFile) {
 }
 
 TEST_F(NativeFileUtilTest, EnsureFileExists) {
-  FilePath file_name = Path("foobar");
+  base::FilePath file_name = Path("foobar");
   bool created = false;
   ASSERT_EQ(base::PLATFORM_FILE_OK,
             NativeFileUtil::EnsureFileExists(file_name, &created));
@@ -91,7 +91,7 @@ TEST_F(NativeFileUtilTest, EnsureFileExists) {
 }
 
 TEST_F(NativeFileUtilTest, CreateAndDeleteDirectory) {
-  FilePath dir_name = Path("test_dir");
+  base::FilePath dir_name = Path("test_dir");
   ASSERT_EQ(base::PLATFORM_FILE_OK,
             NativeFileUtil::CreateDirectory(dir_name,
                                             false /* exclusive */,
@@ -112,7 +112,7 @@ TEST_F(NativeFileUtilTest, CreateAndDeleteDirectory) {
 }
 
 TEST_F(NativeFileUtilTest, TouchFileAndGetFileInfo) {
-  FilePath file_name = Path("test_file");
+  base::FilePath file_name = Path("test_file");
   base::PlatformFileInfo native_info;
   ASSERT_EQ(base::PLATFORM_FILE_ERROR_NOT_FOUND,
             NativeFileUtil::GetFileInfo(file_name, &native_info));
@@ -148,11 +148,12 @@ TEST_F(NativeFileUtilTest, TouchFileAndGetFileInfo) {
 }
 
 TEST_F(NativeFileUtilTest, CreateFileEnumerator) {
-  FilePath path_1 = Path("dir1");
-  FilePath path_2 = Path("file1");
-  FilePath path_11 = Path("dir1").AppendASCII("file11");
-  FilePath path_12 = Path("dir1").AppendASCII("dir12");
-  FilePath path_121 = Path("dir1").AppendASCII("dir12").AppendASCII("file121");
+  base::FilePath path_1 = Path("dir1");
+  base::FilePath path_2 = Path("file1");
+  base::FilePath path_11 = Path("dir1").AppendASCII("file11");
+  base::FilePath path_12 = Path("dir1").AppendASCII("dir12");
+  base::FilePath path_121 =
+      Path("dir1").AppendASCII("dir12").AppendASCII("file121");
   ASSERT_EQ(base::PLATFORM_FILE_OK,
             NativeFileUtil::CreateDirectory(path_1, false, false));
   bool created = false;
@@ -168,10 +169,10 @@ TEST_F(NativeFileUtilTest, CreateFileEnumerator) {
   {
     scoped_ptr<FileSystemFileUtil::AbstractFileEnumerator> enumerator =
         NativeFileUtil::CreateFileEnumerator(Path(), false);
-    std::set<FilePath> set;
+    std::set<base::FilePath> set;
     set.insert(path_1);
     set.insert(path_2);
-    for (FilePath path = enumerator->Next(); !path.empty();
+    for (base::FilePath path = enumerator->Next(); !path.empty();
          path = enumerator->Next())
       EXPECT_EQ(1U, set.erase(path));
     EXPECT_TRUE(set.empty());
@@ -180,13 +181,13 @@ TEST_F(NativeFileUtilTest, CreateFileEnumerator) {
   {
     scoped_ptr<FileSystemFileUtil::AbstractFileEnumerator> enumerator =
         NativeFileUtil::CreateFileEnumerator(Path(), true);
-        std::set<FilePath> set;
+        std::set<base::FilePath> set;
     set.insert(path_1);
     set.insert(path_2);
     set.insert(path_11);
     set.insert(path_12);
     set.insert(path_121);
-    for (FilePath path = enumerator->Next(); !path.empty();
+    for (base::FilePath path = enumerator->Next(); !path.empty();
          path = enumerator->Next())
       EXPECT_EQ(1U, set.erase(path));
     EXPECT_TRUE(set.empty());
@@ -194,7 +195,7 @@ TEST_F(NativeFileUtilTest, CreateFileEnumerator) {
 }
 
 TEST_F(NativeFileUtilTest, Truncate) {
-  FilePath file_name = Path("truncated");
+  base::FilePath file_name = Path("truncated");
   bool created = false;
   ASSERT_EQ(base::PLATFORM_FILE_OK,
             NativeFileUtil::EnsureFileExists(file_name, &created));
@@ -208,9 +209,9 @@ TEST_F(NativeFileUtilTest, Truncate) {
 }
 
 TEST_F(NativeFileUtilTest, CopyFile) {
-  FilePath from_file = Path("fromfile");
-  FilePath to_file1 = Path("tofile1");
-  FilePath to_file2 = Path("tofile2");
+  base::FilePath from_file = Path("fromfile");
+  base::FilePath to_file1 = Path("tofile1");
+  base::FilePath to_file2 = Path("tofile2");
   bool created = false;
   ASSERT_EQ(base::PLATFORM_FILE_OK,
             NativeFileUtil::EnsureFileExists(from_file, &created));
@@ -235,11 +236,11 @@ TEST_F(NativeFileUtilTest, CopyFile) {
   EXPECT_TRUE(FileExists(to_file2));
   EXPECT_EQ(1020, GetSize(to_file2));
 
-  FilePath dir = Path("dir");
+  base::FilePath dir = Path("dir");
   ASSERT_EQ(base::PLATFORM_FILE_OK,
             NativeFileUtil::CreateDirectory(dir, false, false));
   ASSERT_TRUE(file_util::DirectoryExists(dir));
-  FilePath to_dir_file = dir.AppendASCII("file");
+  base::FilePath to_dir_file = dir.AppendASCII("file");
   ASSERT_EQ(base::PLATFORM_FILE_OK,
             NativeFileUtil::CopyOrMoveFile(from_file, to_dir_file, true));
   EXPECT_TRUE(FileExists(to_dir_file));
@@ -270,8 +271,8 @@ TEST_F(NativeFileUtilTest, CopyFile) {
 }
 
 TEST_F(NativeFileUtilTest, MoveFile) {
-  FilePath from_file = Path("fromfile");
-  FilePath to_file = Path("tofile");
+  base::FilePath from_file = Path("fromfile");
+  base::FilePath to_file = Path("tofile");
   bool created = false;
   ASSERT_EQ(base::PLATFORM_FILE_OK,
             NativeFileUtil::EnsureFileExists(from_file, &created));
@@ -294,11 +295,11 @@ TEST_F(NativeFileUtilTest, MoveFile) {
   ASSERT_TRUE(FileExists(from_file));
   ASSERT_EQ(base::PLATFORM_FILE_OK, NativeFileUtil::Truncate(from_file, 1020));
 
-  FilePath dir = Path("dir");
+  base::FilePath dir = Path("dir");
   ASSERT_EQ(base::PLATFORM_FILE_OK,
             NativeFileUtil::CreateDirectory(dir, false, false));
   ASSERT_TRUE(file_util::DirectoryExists(dir));
-  FilePath to_dir_file = dir.AppendASCII("file");
+  base::FilePath to_dir_file = dir.AppendASCII("file");
   ASSERT_EQ(base::PLATFORM_FILE_OK,
             NativeFileUtil::CopyOrMoveFile(from_file, to_dir_file, false));
   EXPECT_FALSE(FileExists(from_file));
diff --git a/webkit/fileapi/obfuscated_file_util_unittest.cc b/webkit/fileapi/obfuscated_file_util_unittest.cc
index 946932c..8bb8e91 100644
--- a/webkit/fileapi/obfuscated_file_util_unittest.cc
+++ b/webkit/fileapi/obfuscated_file_util_unittest.cc
@@ -90,7 +90,7 @@ const OriginEnumerationTestRecord kOriginEnumerationTestRecords[] = {
 };
 
 FileSystemURL FileSystemURLAppend(
-    const FileSystemURL& url, const FilePath::StringType& child) {
+    const FileSystemURL& url, const base::FilePath::StringType& child) {
   return FileSystemURL::CreateForTest(
       url.origin(), url.mount_type(), url.virtual_path().Append(child));
 }
@@ -100,7 +100,7 @@ FileSystemURL FileSystemURLAppendUTF8(
   return FileSystemURL::CreateForTest(
       url.origin(),
       url.mount_type(),
-      url.virtual_path().Append(FilePath::FromUTF8Unsafe(child)));
+      url.virtual_path().Append(base::FilePath::FromUTF8Unsafe(child)));
 }
 
 FileSystemURL FileSystemURLDirName(const FileSystemURL& url) {
diff --git a/webkit/plugins/npapi/plugin_instance.h b/webkit/plugins/npapi/plugin_instance.h
index 0858e97..f7c825e 100644
--- a/webkit/plugins/npapi/plugin_instance.h
+++ b/webkit/plugins/npapi/plugin_instance.h
@@ -319,7 +319,7 @@ class PluginInstance : public base::RefCountedThreadSafe<PluginInstance> {
 
   // List of files created for the current plugin instance. File names are
   // added to the list every time the NPP_StreamAsFile function is called.
-  std::vector<FilePath> files_created_;
+  std::vector<base::FilePath> files_created_;
 
   // Next unusued timer id.
   uint32 next_timer_id_;
diff --git a/webkit/plugins/npapi/plugin_lib_unittest.cc b/webkit/plugins/npapi/plugin_lib_unittest.cc
index a21e1f6..5d6c803 100644
--- a/webkit/plugins/npapi/plugin_lib_unittest.cc
+++ b/webkit/plugins/npapi/plugin_lib_unittest.cc
@@ -27,7 +27,7 @@ class PluginLibTest : public PluginLib {
 TEST(PluginLibLoading, UnloadAllPlugins) {
   // For the creation of the g_loaded_libs global variable.
   ASSERT_EQ(static_cast<PluginLibTest*>(NULL),
-      PluginLibTest::CreatePluginLib(FilePath()));
+      PluginLibTest::CreatePluginLib(base::FilePath()));
 
   // Try with a single plugin lib.
   scoped_refptr<PluginLibTest> plugin_lib1(new PluginLibTest());
@@ -35,7 +35,7 @@ TEST(PluginLibLoading, UnloadAllPlugins) {
 
   // Need to create it again, it should have been destroyed above.
   ASSERT_EQ(static_cast<PluginLibTest*>(NULL),
-      PluginLibTest::CreatePluginLib(FilePath()));
+      PluginLibTest::CreatePluginLib(base::FilePath()));
 
   // Try with two plugin libs.
   plugin_lib1 = new PluginLibTest();
@@ -44,7 +44,7 @@ TEST(PluginLibLoading, UnloadAllPlugins) {
 
   // Need to create it again, it should have been destroyed above.
   ASSERT_EQ(static_cast<PluginLibTest*>(NULL),
-      PluginLibTest::CreatePluginLib(FilePath()));
+      PluginLibTest::CreatePluginLib(base::FilePath()));
 
   // Now try to manually Unload one and then UnloadAll.
   plugin_lib1 = new PluginLibTest();
@@ -54,7 +54,7 @@ TEST(PluginLibLoading, UnloadAllPlugins) {
 
   // Need to create it again, it should have been destroyed above.
   ASSERT_EQ(static_cast<PluginLibTest*>(NULL),
-      PluginLibTest::CreatePluginLib(FilePath()));
+      PluginLibTest::CreatePluginLib(base::FilePath()));
 
   // Now try to manually Unload the only one and then UnloadAll.
   plugin_lib1 = new PluginLibTest();
diff --git a/webkit/tools/test_shell/simple_dom_storage_system.cc b/webkit/tools/test_shell/simple_dom_storage_system.cc
index bd98ddb..f75933c 100644
--- a/webkit/tools/test_shell/simple_dom_storage_system.cc
+++ b/webkit/tools/test_shell/simple_dom_storage_system.cc
@@ -194,7 +194,8 @@ SimpleDomStorageSystem* SimpleDomStorageSystem::g_instance_;
 
 SimpleDomStorageSystem::SimpleDomStorageSystem()
     : weak_factory_(this),
-      context_(new DomStorageContext(FilePath(), FilePath(), NULL, NULL)),
+      context_(new DomStorageContext(base::FilePath(), base::FilePath(),
+                                     NULL, NULL)),
       host_(new DomStorageHost(context_)),
       area_being_processed_(NULL),
       next_connection_id_(1) {