summaryrefslogtreecommitdiffstats
path: root/chrome/browser/browsing_data_database_helper.cc
diff options
context:
space:
mode:
authorjochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-29 07:21:13 +0000
committerjochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-29 07:21:13 +0000
commitf58330c4b964edd22ef02325390975a013a3f34a (patch)
tree15061bcc0ca596409a7113cde0bffc2b49206a0c /chrome/browser/browsing_data_database_helper.cc
parent82d76938133d016ac5d9cc4b56d603f96876e7f3 (diff)
downloadchromium_src-f58330c4b964edd22ef02325390975a013a3f34a.zip
chromium_src-f58330c4b964edd22ef02325390975a013a3f34a.tar.gz
chromium_src-f58330c4b964edd22ef02325390975a013a3f34a.tar.bz2
Don't show extension state in cookie tree list.
BUG=38659 TEST=Unit tests in browsing_data_local_storage_helper_unittest.cc and browsing_data_database_helper_unittest.cc Review URL: http://codereview.chromium.org/1405002 Patch from Mattias Nissler. git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42935 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browsing_data_database_helper.cc')
-rw-r--r--chrome/browser/browsing_data_database_helper.cc9
1 files changed, 8 insertions, 1 deletions
diff --git a/chrome/browser/browsing_data_database_helper.cc b/chrome/browser/browsing_data_database_helper.cc
index 9c3acf0..5b950cf 100644
--- a/chrome/browser/browsing_data_database_helper.cc
+++ b/chrome/browser/browsing_data_database_helper.cc
@@ -56,6 +56,13 @@ void BrowsingDataDatabaseHelper::FetchDatabaseInfoInFileThread() {
if (tracker_.get() && tracker_->GetAllOriginsInfo(&origins_info)) {
for (std::vector<webkit_database::OriginInfo>::const_iterator ori =
origins_info.begin(); ori != origins_info.end(); ++ori) {
+ const std::string origin_identifier(UTF16ToUTF8(ori->GetOrigin()));
+ if (StartsWithASCII(origin_identifier,
+ std::string(chrome::kExtensionScheme),
+ true)) {
+ // Extension state is not considered browsing data.
+ continue;
+ }
scoped_ptr<WebKit::WebSecurityOrigin> web_security_origin(
WebKit::WebSecurityOrigin::createFromDatabaseIdentifier(
ori->GetOrigin()));
@@ -69,7 +76,7 @@ void BrowsingDataDatabaseHelper::FetchDatabaseInfoInFileThread() {
database_info_.push_back(DatabaseInfo(
web_security_origin->host().utf8(),
UTF16ToUTF8(*db),
- UTF16ToUTF8(ori->GetOrigin()),
+ origin_identifier,
UTF16ToUTF8(ori->GetDatabaseDescription(*db)),
file_info.size,
file_info.last_modified));