diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-25 16:18:40 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-25 16:18:40 +0000 |
| commit | e434fe731ed78fe3a04b3748a0d948c9213fdad3 (patch) | |
| tree | e4a048075b37bd5b18a0ef960ac5c93ecb4fe0cd /webkit/browser/database | |
| parent | 32dfede31f73b2ad13b415d7c5ed21734b3ab8d1 (diff) | |
| download | chromium_src-e434fe731ed78fe3a04b3748a0d948c9213fdad3.zip chromium_src-e434fe731ed78fe3a04b3748a0d948c9213fdad3.tar.gz chromium_src-e434fe731ed78fe3a04b3748a0d948c9213fdad3.tar.bz2 | |
webkit: Remove usage of deprecated FilePath::FromWStringHack() function.
BUG=24672,76112
TEST=content_unittests
R=darin@chromium.org
Review URL: https://chromiumcodereview.appspot.com/23301002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@219483 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/browser/database')
| -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( |