diff options
| -rw-r--r-- | webkit/browser/database/database_tracker.cc | 10 | ||||
| -rw-r--r-- | webkit/browser/database/database_tracker_unittest.cc | 30 |
2 files changed, 19 insertions, 21 deletions
diff --git a/webkit/browser/database/database_tracker.cc b/webkit/browser/database/database_tracker.cc index e3b3c6a..f9adb3b 100644 --- a/webkit/browser/database/database_tracker.cc +++ b/webkit/browser/database/database_tracker.cc @@ -289,15 +289,13 @@ base::FilePath DatabaseTracker::GetFullDBFilePath( if (!LazyInit()) return base::FilePath(); - int64 id = databases_table_->GetDatabaseID( - origin_identifier, database_name); + int64 id = databases_table_->GetDatabaseID(origin_identifier, database_name); if (id < 0) return base::FilePath(); - base::FilePath file_name = base::FilePath::FromWStringHack( - UTF8ToWide(base::Int64ToString(id))); - return db_dir_.Append(base::FilePath::FromWStringHack( - UTF16ToWide(GetOriginDirectory(origin_identifier)))).Append(file_name); + return db_dir_.Append(base::FilePath::FromUTF16Unsafe( + GetOriginDirectory(origin_identifier))).AppendASCII( + base::Int64ToString(id)); } bool DatabaseTracker::GetOriginInfo(const std::string& origin_identifier, diff --git a/webkit/browser/database/database_tracker_unittest.cc b/webkit/browser/database/database_tracker_unittest.cc index 25f0a69..860faa0 100644 --- a/webkit/browser/database/database_tracker_unittest.cc +++ b/webkit/browser/database/database_tracker_unittest.cc @@ -220,12 +220,12 @@ class DatabaseTracker_TestHelper_Test { tracker->DatabaseOpened(kOrigin2, kDB3, kDescription, 0, &database_size); - EXPECT_TRUE(file_util::CreateDirectory(tracker->DatabaseDirectory().Append( - base::FilePath::FromWStringHack(UTF16ToWide( - tracker->GetOriginDirectory(kOrigin1)))))); - EXPECT_TRUE(file_util::CreateDirectory(tracker->DatabaseDirectory().Append( - base::FilePath::FromWStringHack(UTF16ToWide( - tracker->GetOriginDirectory(kOrigin2)))))); + EXPECT_TRUE(file_util::CreateDirectory( + tracker->DatabaseDirectory().Append(base::FilePath::FromUTF16Unsafe( + tracker->GetOriginDirectory(kOrigin1))))); + EXPECT_TRUE(file_util::CreateDirectory( + tracker->DatabaseDirectory().Append(base::FilePath::FromUTF16Unsafe( + tracker->GetOriginDirectory(kOrigin2))))); EXPECT_EQ(1, file_util::WriteFile( tracker->GetFullDBFilePath(kOrigin1, kDB1), "a", 1)); EXPECT_EQ(2, file_util::WriteFile( @@ -255,9 +255,9 @@ class DatabaseTracker_TestHelper_Test { // Recreate db1. tracker->DatabaseOpened(kOrigin1, kDB1, kDescription, 0, &database_size); - EXPECT_TRUE(file_util::CreateDirectory(tracker->DatabaseDirectory().Append( - base::FilePath::FromWStringHack(UTF16ToWide( - tracker->GetOriginDirectory(kOrigin1)))))); + EXPECT_TRUE(file_util::CreateDirectory( + tracker->DatabaseDirectory().Append(base::FilePath::FromUTF16Unsafe( + tracker->GetOriginDirectory(kOrigin1))))); EXPECT_EQ(1, file_util::WriteFile( tracker->GetFullDBFilePath(kOrigin1, kDB1), "a", 1)); tracker->DatabaseModified(kOrigin1, kDB1); @@ -348,12 +348,12 @@ class DatabaseTracker_TestHelper_Test { // Write some data to each file and check that the listeners are // called with the appropriate values. - EXPECT_TRUE(file_util::CreateDirectory(tracker->DatabaseDirectory().Append( - base::FilePath::FromWStringHack(UTF16ToWide( - tracker->GetOriginDirectory(kOrigin1)))))); - EXPECT_TRUE(file_util::CreateDirectory(tracker->DatabaseDirectory().Append( - base::FilePath::FromWStringHack(UTF16ToWide( - tracker->GetOriginDirectory(kOrigin2)))))); + EXPECT_TRUE(file_util::CreateDirectory( + tracker->DatabaseDirectory().Append(base::FilePath::FromUTF16Unsafe( + tracker->GetOriginDirectory(kOrigin1))))); + EXPECT_TRUE(file_util::CreateDirectory( + tracker->DatabaseDirectory().Append(base::FilePath::FromUTF16Unsafe( + tracker->GetOriginDirectory(kOrigin2))))); EXPECT_EQ(1, file_util::WriteFile( tracker->GetFullDBFilePath(kOrigin1, kDB1), "a", 1)); EXPECT_EQ(2, file_util::WriteFile( |