diff options
| author | nirnimesh@chromium.org <nirnimesh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-04 18:35:39 +0000 |
|---|---|---|
| committer | nirnimesh@chromium.org <nirnimesh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-04 18:35:39 +0000 |
| commit | 7aa5537b535404a028f9a424466d9eea5f9c937e (patch) | |
| tree | ef97168228a1d61de339d03ab6db7c1c937174ec /chrome/browser/browsing_data_remover.cc | |
| parent | 0aa416f875f99ec417475ea5b126f0df806699f8 (diff) | |
| download | chromium_src-7aa5537b535404a028f9a424466d9eea5f9c937e.zip chromium_src-7aa5537b535404a028f9a424466d9eea5f9c937e.tar.gz chromium_src-7aa5537b535404a028f9a424466d9eea5f9c937e.tar.bz2 | |
Revert 130682 - Revert 130574 - Adding a BrowsingDataHelper class to hold some useful methods.
*** REVERT NOTICE ***
This CL reliably broke a pyauto test.
See
http://build.chromium.org/p/chromium.pyauto/builders/Linux%20%28deb%29/builds/31393/
where it failed first, and this is the only CL in that range.
***
There's simply no good reason to hardcode checks against
chrome::kExtensionScheme in various bits of BrowsingData*. BrowsingDataHelper
provides a static method that we can start using whenever we need to know about
browsing-data-relevant schemes.
BUG=121636
TEST=unit_tests:BrowsingDataRemover*
Review URL: https://chromiumcodereview.appspot.com/9958111
TBR=mkwst@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9982012
TBR=nirnimesh@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9947003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@130689 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browsing_data_remover.cc')
| -rw-r--r-- | chrome/browser/browsing_data_remover.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/chrome/browser/browsing_data_remover.cc b/chrome/browser/browsing_data_remover.cc index 1fc54db..70622cf 100644 --- a/chrome/browser/browsing_data_remover.cc +++ b/chrome/browser/browsing_data_remover.cc @@ -16,6 +16,7 @@ #include "chrome/browser/autofill/personal_data_manager.h" #include "chrome/browser/autofill/personal_data_manager_factory.h" #include "chrome/browser/browser_process.h" +#include "chrome/browser/browsing_data_helper.h" #include "chrome/browser/download/download_service.h" #include "chrome/browser/download/download_service_factory.h" #include "chrome/browser/extensions/extension_service.h" @@ -614,6 +615,8 @@ void BrowsingDataRemover::OnGotQuotaManagedOrigins( // isn't protected. std::set<GURL>::const_iterator origin; for (origin = origins.begin(); origin != origins.end(); ++origin) { + if (!BrowsingDataHelper::IsValidScheme(origin->scheme())) + continue; if (special_storage_policy_->IsStorageProtected(origin->GetOrigin())) continue; if (!remove_origin_.is_empty() && remove_origin_ != origin->GetOrigin()) |