Add FilePath to base namespace.

webkit/dom_storage/dom_storage_database_unittest.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/dom_storage/dom_storage_database.h"
 
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/path_service.h"
@@ skipping 92 matching lines @@
   ASSERT_TRUE(db.LazyOpen(true));
   EXPECT_TRUE(db.IsOpen());
   EXPECT_EQ(DomStorageDatabase::V2, db.DetectSchemaVersion());
   db.Close();
   EXPECT_FALSE(db.IsOpen());
 }
 
 TEST(DomStorageDatabaseTest, CloseEmptyDatabaseDeletesFile) {
   base::ScopedTempDir temp_dir;
   ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
-  FilePath file_name = temp_dir.path().AppendASCII("TestDomStorageDatabase.db");
+  base::FilePath file_name = temp_dir.path().AppendASCII("TestDomStorageDatabase.db");
   ValuesMap storage;
   CreateMapWithValues(&storage);
 
   // First test the case that explicitly clearing the database will
   // trigger its deletion from disk.
   {
     DomStorageDatabase db(file_name);
     EXPECT_EQ(file_name, db.file_path());
     ASSERT_TRUE(db.CommitChanges(false, storage));
   }
@@ skipping 36 matching lines @@
     ASSERT_TRUE(db.CommitChanges(false, storage));
   }
   EXPECT_FALSE(file_util::PathExists(file_name));
 }
 
 TEST(DomStorageDatabaseTest, TestLazyOpenIsLazy) {
   // This test needs to operate with a file on disk to ensure that we will
   // open a file that already exists when only invoking ReadAllValues.
   base::ScopedTempDir temp_dir;
   ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
-  FilePath file_name = temp_dir.path().AppendASCII("TestDomStorageDatabase.db");
+  base::FilePath file_name = temp_dir.path().AppendASCII("TestDomStorageDatabase.db");
 
   DomStorageDatabase db(file_name);
   EXPECT_FALSE(db.IsOpen());
   ValuesMap values;
   db.ReadAllValues(&values);
   // Reading an empty db should not open the database.
   EXPECT_FALSE(db.IsOpen());
 
   values[ASCIIToUTF16("key")] = NullableString16(ASCIIToUTF16("value"), false);
   db.CommitChanges(false, values);
@@ skipping 26 matching lines @@
   EXPECT_EQ(DomStorageDatabase::V2, db.DetectSchemaVersion());
 }
 
 TEST(DomStorageDatabaseTest, TestLazyOpenUpgradesDatabase) {
   // This test needs to operate with a file on disk so that we
   // can create a table at version 1 and then close it again
   // so that LazyOpen sees there is work to do (LazyOpen will return
   // early if the database is already open).
   base::ScopedTempDir temp_dir;
   ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
-  FilePath file_name = temp_dir.path().AppendASCII("TestDomStorageDatabase.db");
+  base::FilePath file_name = temp_dir.path().AppendASCII("TestDomStorageDatabase.db");
 
   DomStorageDatabase db(file_name);
   db.db_.reset(new sql::Connection());
   ASSERT_TRUE(db.db_->Open(file_name));
   CreateV1Table(db.db_.get());
   db.Close();
 
   EXPECT_TRUE(db.LazyOpen(true));
   EXPECT_EQ(DomStorageDatabase::V2, db.DetectSchemaVersion());
 }
@@ skipping 66 matching lines @@
   // A null string in the map should mean that that key gets
   // removed.
   values[kCannedKey] = NullableString16(true);
   EXPECT_TRUE(db.CommitChanges(false, values));
 
   expected.clear();
   CheckValuesMatch(&db, expected);
 }
 
 TEST(DomStorageDatabaseTest, TestCanOpenAndReadWebCoreDatabase) {
-  FilePath webcore_database;
+  base::FilePath webcore_database;
   PathService::Get(base::DIR_SOURCE_ROOT, &webcore_database);
   webcore_database = webcore_database.AppendASCII("webkit");
   webcore_database = webcore_database.AppendASCII("data");
   webcore_database = webcore_database.AppendASCII("dom_storage");
   webcore_database =
       webcore_database.AppendASCII("webcore_test_database.localstorage");
 
   ASSERT_TRUE(file_util::PathExists(webcore_database));
 
   DomStorageDatabase db(webcore_database);
@@ skipping 12 matching lines @@
   EXPECT_EQ(ASCIIToUTF16("1326738338841"), it->second.string());
 
   it = values.find(ASCIIToUTF16("not_there"));
   EXPECT_TRUE(it == values.end());
 }
 
 TEST(DomStorageDatabaseTest, TestCanOpenFileThatIsNotADatabase) {
   // Write into the temporary file first.
   base::ScopedTempDir temp_dir;
   ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
-  FilePath file_name = temp_dir.path().AppendASCII("TestDomStorageDatabase.db");
+  base::FilePath file_name = temp_dir.path().AppendASCII("TestDomStorageDatabase.db");
 
   const char kData[] = "I am not a database.";
   file_util::WriteFile(file_name, kData, strlen(kData));
 
   {
     // Try and open the file. As it's not a database, we should end up deleting
     // it and creating a new, valid file, so everything should actually
     // succeed.
     DomStorageDatabase db(file_name);
     ValuesMap values;
@@ skipping 19 matching lines @@
 
     db.ReadAllValues(&values);
     EXPECT_EQ(0u, values.size());
     EXPECT_FALSE(db.IsOpen());
 
     EXPECT_TRUE(file_util::PathExists(temp_dir.path()));
   }
 }
 
 }  // namespace dom_storage