diff options
| author | Andras Becsi <andras.becsi@digia.com> | 2013-12-11 21:33:03 +0100 |
|---|---|---|
| committer | Andras Becsi <andras.becsi@digia.com> | 2013-12-13 12:34:07 +0100 |
| commit | f2a33ff9cbc6d19943f1c7fbddd1f23d23975577 (patch) | |
| tree | 0586a32aa390ade8557dfd6b4897f43a07449578 /chromium/webkit/browser/database/database_tracker.cc | |
| parent | 5362912cdb5eea702b68ebe23702468d17c3017a (diff) | |
| download | qtwebengine-chromium-f2a33ff9cbc6d19943f1c7fbddd1f23d23975577.tar.gz | |
Update Chromium to branch 1650 (31.0.1650.63)
Change-Id: I57d8c832eaec1eb2364e0a8e7352a6dd354db99f
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Diffstat (limited to 'chromium/webkit/browser/database/database_tracker.cc')
| -rw-r--r-- | chromium/webkit/browser/database/database_tracker.cc | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/chromium/webkit/browser/database/database_tracker.cc b/chromium/webkit/browser/database/database_tracker.cc index e3b3c6abe83..f9adb3bed43 100644 --- a/chromium/webkit/browser/database/database_tracker.cc +++ b/chromium/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, |