diff options
| author | dumi@chromium.org <dumi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-17 02:20:14 +0000 |
|---|---|---|
| committer | dumi@chromium.org <dumi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-17 02:20:14 +0000 |
| commit | 07628c01d6c4f009abc2874099822c2bb9dd89fc (patch) | |
| tree | a05cbc5b5ddf7620171adc452bbda6c6fd827086 /chrome/browser/browsing_data_database_helper.cc | |
| parent | 6523f294e0c687a14a625e7488e761adfb55998c (diff) | |
| download | chromium_src-07628c01d6c4f009abc2874099822c2bb9dd89fc.zip chromium_src-07628c01d6c4f009abc2874099822c2bb9dd89fc.tar.gz chromium_src-07628c01d6c4f009abc2874099822c2bb9dd89fc.tar.bz2 | |
Roll WebKit's version to 57768 to pick up a change to
WebSecurityOrigin::createFromDatabaseIdentifier(), and fix all its
callers.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/1646013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@44870 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browsing_data_database_helper.cc')
| -rw-r--r-- | chrome/browser/browsing_data_database_helper.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/browsing_data_database_helper.cc b/chrome/browser/browsing_data_database_helper.cc index 5b950cf..7ff2428 100644 --- a/chrome/browser/browsing_data_database_helper.cc +++ b/chrome/browser/browsing_data_database_helper.cc @@ -63,9 +63,9 @@ void BrowsingDataDatabaseHelper::FetchDatabaseInfoInFileThread() { // Extension state is not considered browsing data. continue; } - scoped_ptr<WebKit::WebSecurityOrigin> web_security_origin( + WebKit::WebSecurityOrigin web_security_origin = WebKit::WebSecurityOrigin::createFromDatabaseIdentifier( - ori->GetOrigin())); + ori->GetOrigin()); std::vector<string16> databases; ori->GetAllDatabaseNames(&databases); for (std::vector<string16>::const_iterator db = databases.begin(); @@ -74,7 +74,7 @@ void BrowsingDataDatabaseHelper::FetchDatabaseInfoInFileThread() { file_util::FileInfo file_info; if (file_util::GetFileInfo(file_path, &file_info)) { database_info_.push_back(DatabaseInfo( - web_security_origin->host().utf8(), + web_security_origin.host().utf8(), UTF16ToUTF8(*db), origin_identifier, UTF16ToUTF8(ori->GetDatabaseDescription(*db)), |