diff options
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/browsing_data_database_helper.cc | 6 | ||||
| -rw-r--r-- | chrome/browser/browsing_data_local_storage_helper.cc | 16 | ||||
| -rw-r--r-- | chrome/browser/in_process_webkit/dom_storage_context.cc | 12 |
3 files changed, 17 insertions, 17 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)), diff --git a/chrome/browser/browsing_data_local_storage_helper.cc b/chrome/browser/browsing_data_local_storage_helper.cc index b29a65a..091f9a0 100644 --- a/chrome/browser/browsing_data_local_storage_helper.cc +++ b/chrome/browser/browsing_data_local_storage_helper.cc @@ -67,10 +67,10 @@ void BrowsingDataLocalStorageHelper::FetchLocalStorageInfoInWebKitThread() { for (FilePath file_path = file_enumerator.Next(); !file_path.empty(); file_path = file_enumerator.Next()) { if (file_path.Extension() == DOMStorageContext::kLocalStorageExtension) { - scoped_ptr<WebKit::WebSecurityOrigin> web_security_origin( + WebKit::WebSecurityOrigin web_security_origin = WebKit::WebSecurityOrigin::createFromDatabaseIdentifier( - webkit_glue::FilePathToWebString(file_path.BaseName()))); - if (EqualsASCII(web_security_origin->protocol(), + webkit_glue::FilePathToWebString(file_path.BaseName())); + if (EqualsASCII(web_security_origin.protocol(), chrome::kExtensionScheme)) { // Extension state is not considered browsing data. continue; @@ -79,11 +79,11 @@ void BrowsingDataLocalStorageHelper::FetchLocalStorageInfoInWebKitThread() { bool ret = file_util::GetFileInfo(file_path, &file_info); if (ret) { local_storage_info_.push_back(LocalStorageInfo( - web_security_origin->protocol().utf8(), - web_security_origin->host().utf8(), - web_security_origin->port(), - web_security_origin->databaseIdentifier().utf8(), - web_security_origin->toString().utf8(), + web_security_origin.protocol().utf8(), + web_security_origin.host().utf8(), + web_security_origin.port(), + web_security_origin.databaseIdentifier().utf8(), + web_security_origin.toString().utf8(), file_path, file_info.size, file_info.last_modified)); diff --git a/chrome/browser/in_process_webkit/dom_storage_context.cc b/chrome/browser/in_process_webkit/dom_storage_context.cc index bea4611..a4cba5f 100644 --- a/chrome/browser/in_process_webkit/dom_storage_context.cc +++ b/chrome/browser/in_process_webkit/dom_storage_context.cc @@ -166,10 +166,10 @@ void DOMStorageContext::DeleteDataModifiedSince( file_util::FileEnumerator::FILES); for (FilePath path = file_enumerator.Next(); !path.value().empty(); path = file_enumerator.Next()) { - scoped_ptr<WebKit::WebSecurityOrigin> web_security_origin( + WebKit::WebSecurityOrigin web_security_origin = WebKit::WebSecurityOrigin::createFromDatabaseIdentifier( - webkit_glue::FilePathToWebString(path.BaseName()))); - if (EqualsASCII(web_security_origin->protocol(), url_scheme_to_be_skipped)) + webkit_glue::FilePathToWebString(path.BaseName())); + if (EqualsASCII(web_security_origin.protocol(), url_scheme_to_be_skipped)) continue; file_util::FileEnumerator::FindInfo find_info; file_enumerator.GetFindInfo(&find_info); @@ -260,10 +260,10 @@ void DOMStorageContext::ClearLocalState(const FilePath& profile_path, for (FilePath file_path = file_enumerator.Next(); !file_path.empty(); file_path = file_enumerator.Next()) { if (file_path.Extension() == kLocalStorageExtension) { - scoped_ptr<WebKit::WebSecurityOrigin> web_security_origin( + WebKit::WebSecurityOrigin web_security_origin = WebKit::WebSecurityOrigin::createFromDatabaseIdentifier( - webkit_glue::FilePathToWebString(file_path.BaseName()))); - if (!EqualsASCII(web_security_origin->protocol(), + webkit_glue::FilePathToWebString(file_path.BaseName())); + if (!EqualsASCII(web_security_origin.protocol(), url_scheme_to_be_skipped)) file_util::Delete(file_path, false); } |