Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(318)

Unified Diff: webkit/dom_storage/dom_storage_area_unittest.cc

Issue 12163003: Add FilePath to base namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webkit/dom_storage/dom_storage_area.cc ('k') | webkit/dom_storage/dom_storage_context.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/dom_storage/dom_storage_area_unittest.cc
diff --git a/webkit/dom_storage/dom_storage_area_unittest.cc b/webkit/dom_storage/dom_storage_area_unittest.cc
index 4513ea309eeb91e5b6f889f765e84c9d36afe775..6667312f786cf0eb28fc2690cff12da2aa4f9a75 100644
--- a/webkit/dom_storage/dom_storage_area_unittest.cc
+++ b/webkit/dom_storage/dom_storage_area_unittest.cc
@@ -126,13 +126,13 @@ TEST_F(DomStorageAreaTest, BackingDatabaseOpened) {
const int64 kSessionStorageNamespaceId = kLocalStorageNamespaceId + 1;
base::ScopedTempDir temp_dir;
ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
- const FilePath kExpectedOriginFilePath = temp_dir.path().Append(
+ const base::FilePath kExpectedOriginFilePath = temp_dir.path().Append(
DomStorageArea::DatabaseFileNameFromOrigin(kOrigin));
// No directory, backing should be null.
{
scoped_refptr<DomStorageArea> area(
- new DomStorageArea(kOrigin, FilePath(), NULL));
+ new DomStorageArea(kOrigin, base::FilePath(), NULL));
EXPECT_EQ(NULL, area->backing_.get());
EXPECT_TRUE(area->is_initial_import_done_);
EXPECT_FALSE(file_util::PathExists(kExpectedOriginFilePath));
@@ -315,9 +315,9 @@ TEST_F(DomStorageAreaTest, DeleteOrigin) {
new MockDomStorageTaskRunner(base::MessageLoopProxy::current())));
// This test puts files on disk.
- FilePath db_file_path = static_cast<LocalStorageDatabaseAdapter*>(
+ base::FilePath db_file_path = static_cast<LocalStorageDatabaseAdapter*>(
area->backing_.get())->db_->file_path();
- FilePath db_journal_file_path =
+ base::FilePath db_journal_file_path =
DomStorageDatabase::GetJournalFilePath(db_file_path);
// Nothing bad should happen when invoked w/o any files on disk.
@@ -443,9 +443,9 @@ TEST_F(DomStorageAreaTest, DatabaseFileNames) {
for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kCases); ++i) {
GURL origin = GURL(kCases[i].origin).GetOrigin();
- FilePath file_name = FilePath().AppendASCII(kCases[i].file_name);
- FilePath journal_file_name =
- FilePath().AppendASCII(kCases[i].journal_file_name);
+ base::FilePath file_name = base::FilePath().AppendASCII(kCases[i].file_name);
+ base::FilePath journal_file_name =
+ base::FilePath().AppendASCII(kCases[i].journal_file_name);
EXPECT_EQ(file_name,
DomStorageArea::DatabaseFileNameFromOrigin(origin));
@@ -456,17 +456,17 @@ TEST_F(DomStorageAreaTest, DatabaseFileNames) {
}
// Also test some DomStorageDatabase::GetJournalFilePath cases here.
- FilePath parent = FilePath().AppendASCII("a").AppendASCII("b");
+ base::FilePath parent = base::FilePath().AppendASCII("a").AppendASCII("b");
EXPECT_EQ(
parent.AppendASCII("file-journal"),
DomStorageDatabase::GetJournalFilePath(parent.AppendASCII("file")));
EXPECT_EQ(
- FilePath().AppendASCII("-journal"),
- DomStorageDatabase::GetJournalFilePath(FilePath()));
+ base::FilePath().AppendASCII("-journal"),
+ DomStorageDatabase::GetJournalFilePath(base::FilePath()));
EXPECT_EQ(
- FilePath().AppendASCII(".extensiononly-journal"),
+ base::FilePath().AppendASCII(".extensiononly-journal"),
DomStorageDatabase::GetJournalFilePath(
- FilePath().AppendASCII(".extensiononly")));
+ base::FilePath().AppendASCII(".extensiononly")));
}
} // namespace dom_storage
« no previous file with comments | « webkit/dom_storage/dom_storage_area.cc ('k') | webkit/dom_storage/dom_storage_context.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698