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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@130682 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 11 insertions, 50 deletions

diff --git a/chrome/browser/browsing_data_remover_unittest.cc b/chrome/browser/browsing_data_remover_unittest.cc
index 6df3a3c..833fd24 100644
--- a/chrome/browser/browsing_data_remover_unittest.cc
+++ b/chrome/browser/browsing_data_remover_unittest.cc
@@ -40,17 +40,13 @@ using content::BrowserThread;
 
 namespace {
 
-const char kTestOrigin1[] = "http://host1:1/";
-const char kTestOrigin2[] = "http://host2:1/";
-const char kTestOrigin3[] = "http://host3:1/";
-const char kTestOriginExt[] = "chrome-extension://abcdefghijklmnopqrstuvwxyz/";
-const char kTestOriginDevTools[] = "chrome-devtools://abcdefghijklmnopqrstuvw/";
-
-const GURL kOrigin1(kTestOrigin1);
-const GURL kOrigin2(kTestOrigin2);
-const GURL kOrigin3(kTestOrigin3);
-const GURL kOriginExt(kTestOriginExt);
-const GURL kOriginDevTools(kTestOriginDevTools);
+const char kTestkOrigin1[] = "http://host1:1/";
+const char kTestkOrigin2[] = "http://host2:1/";
+const char kTestkOrigin3[] = "http://host3:1/";
+
+const GURL kOrigin1(kTestkOrigin1);
+const GURL kOrigin2(kTestkOrigin2);
+const GURL kOrigin3(kTestkOrigin3);
 
 const quota::StorageType kTemporary = quota::kStorageTypeTemporary;
 const quota::StorageType kPersistent = quota::kStorageTypePersistent;
@@ -306,14 +302,6 @@ class RemoveQuotaManagedDataTester : public BrowsingDataRemoverTester {
     PopulateTestQuotaManagedTemporaryData(manager);
   }
 
-  void PopulateTestQuotaManagedNonBrowsingData(
-      quota::MockQuotaManager* manager) {
-    manager->AddOrigin(kOriginDevTools, kTemporary, kClientFile, base::Time());
-    manager->AddOrigin(kOriginDevTools, kPersistent, kClientFile, base::Time());
-    manager->AddOrigin(kOriginExt, kTemporary, kClientFile, base::Time());
-    manager->AddOrigin(kOriginExt, kPersistent, kClientFile, base::Time());
-  }
-
   void PopulateTestQuotaManagedPersistentData(
       quota::MockQuotaManager* manager) {
     manager->AddOrigin(kOrigin2, kPersistent, kClientFile, base::Time());
@@ -527,7 +515,7 @@ TEST_F(BrowsingDataRemoverTest, RemoveServerBoundCertForever) {
   scoped_ptr<RemoveServerBoundCertTester> tester(
       new RemoveServerBoundCertTester(GetProfile()));
 
-  tester->AddServerBoundCert(kTestOrigin1);
+  tester->AddServerBoundCert(kTestkOrigin1);
   EXPECT_EQ(1, tester->ServerBoundCertCount());
 
   BlockUntilBrowsingDataRemoved(BrowsingDataRemover::EVERYTHING,
@@ -542,8 +530,8 @@ TEST_F(BrowsingDataRemoverTest, RemoveServerBoundCertLastHour) {
       new RemoveServerBoundCertTester(GetProfile()));
 
   base::Time now = base::Time::Now();
-  tester->AddServerBoundCert(kTestOrigin1);
-  tester->AddServerBoundCertWithTimes(kTestOrigin2,
+  tester->AddServerBoundCert(kTestkOrigin1);
+  tester->AddServerBoundCertWithTimes(kTestkOrigin2,
                                       now - base::TimeDelta::FromHours(2),
                                       now);
   EXPECT_EQ(2, tester->ServerBoundCertCount());
@@ -555,7 +543,7 @@ TEST_F(BrowsingDataRemoverTest, RemoveServerBoundCertLastHour) {
   EXPECT_EQ(1, tester->ServerBoundCertCount());
   std::vector<net::ServerBoundCertStore::ServerBoundCert> certs;
   tester->GetCertStore()->GetAllServerBoundCerts(&certs);
-  EXPECT_EQ(kTestOrigin2, certs[0].server_identifier());
+  EXPECT_EQ(kTestkOrigin2, certs[0].server_identifier());
 }
 
 TEST_F(BrowsingDataRemoverTest, RemoveHistoryForever) {
@@ -862,33 +850,6 @@ TEST_F(BrowsingDataRemoverTest, RemoveQuotaManagedProtectedSpecificOrigin) {
       kClientFile));
 }
 
-TEST_F(BrowsingDataRemoverTest, RemoveQuotaManagedIgnoreExtensionsAndDevTools) {
-  scoped_ptr<RemoveQuotaManagedDataTester> tester(
-      new RemoveQuotaManagedDataTester());
-  tester->PopulateTestQuotaManagedNonBrowsingData(GetMockManager());
-
-  BlockUntilBrowsingDataRemoved(BrowsingDataRemover::EVERYTHING,
-      BrowsingDataRemover::REMOVE_APPCACHE |
-      BrowsingDataRemover::REMOVE_FILE_SYSTEMS |
-      BrowsingDataRemover::REMOVE_INDEXEDDB |
-      BrowsingDataRemover::REMOVE_WEBSQL, tester.get());
-
-  EXPECT_EQ(BrowsingDataRemover::REMOVE_APPCACHE |
-      BrowsingDataRemover::REMOVE_FILE_SYSTEMS |
-      BrowsingDataRemover::REMOVE_INDEXEDDB |
-      BrowsingDataRemover::REMOVE_WEBSQL, GetRemovalMask());
-
-  // Check that extension and devtools data isn't removed.
-  EXPECT_TRUE(GetMockManager()->OriginHasData(kOriginExt, kTemporary,
-      kClientFile));
-  EXPECT_TRUE(GetMockManager()->OriginHasData(kOriginExt, kPersistent,
-      kClientFile));
-  EXPECT_TRUE(GetMockManager()->OriginHasData(kOriginDevTools, kTemporary,
-      kClientFile));
-  EXPECT_TRUE(GetMockManager()->OriginHasData(kOriginDevTools, kPersistent,
-      kClientFile));
-}
-
 TEST_F(BrowsingDataRemoverTest, OriginBasedHistoryRemoval) {
   scoped_ptr<RemoveHistoryTester> tester(
       new RemoveHistoryTester(GetProfile()));