Domain Reliability: Remove browsing data when requested.

chrome/browser/browsing_data/browsing_data_remover_unittest.cc

Index: chrome/browser/browsing_data/browsing_data_remover_unittest.cc
diff --git a/chrome/browser/browsing_data/browsing_data_remover_unittest.cc b/chrome/browser/browsing_data/browsing_data_remover_unittest.cc
index 35a61f0abb2f4fd8e2e5c83a63383419d90e3d59..9414313b0fabbcf3d5c2e825f6136ffcc2dcd000 100644
--- a/chrome/browser/browsing_data/browsing_data_remover_unittest.cc
+++ b/chrome/browser/browsing_data/browsing_data_remover_unittest.cc
@@ -43,6 +43,8 @@
 #include "components/autofill/core/browser/credit_card.h"
 #include "components/autofill/core/browser/personal_data_manager.h"
 #include "components/autofill/core/browser/personal_data_manager_observer.h"
+#include "components/domain_reliability/clear_mode.h"
+#include "components/domain_reliability/monitor.h"
 #include "content/public/browser/cookie_store_factory.h"
 #include "content/public/browser/dom_storage_context.h"
 #include "content/public/browser/local_storage_usage_info.h"
@@ -62,6 +64,10 @@
 
 using content::BrowserThread;
 using content::StoragePartition;
+using domain_reliability::CLEAR_BEACONS;
+using domain_reliability::CLEAR_CONTEXTS;
+using domain_reliability::DomainReliabilityClearMode;
+using domain_reliability::DomainReliabilityMonitor;
 using testing::_;
 using testing::Invoke;
 using testing::WithArgs;
@@ -574,6 +580,25 @@ class RemoveLocalStorageTester {
   DISALLOW_COPY_AND_ASSIGN(RemoveLocalStorageTester);
 };
 
+class TestingProfileWithDomainReliabilityMonitor : public TestingProfile {
+ public:
+  TestingProfileWithDomainReliabilityMonitor() :
+      TestingProfile(),
+      monitor_(GetRequestContext()->GetURLRequestContext()) {}
+
+  virtual void ClearDomainReliabilityMonitor(
+      DomainReliabilityClearMode mode,
+      const base::Closure& completion) OVERRIDE {
+    monitor_.ClearBrowsingData(mode);
+    completion.Run();
+  }
+
+  DomainReliabilityMonitor* monitor() { return &monitor_; }
+
+ private:
+  DomainReliabilityMonitor monitor_;
+};
+
 // Test Class ----------------------------------------------------------------
 
 class BrowsingDataRemoverTest : public testing::Test,
@@ -679,6 +704,14 @@ class BrowsingDataRemoverTest : public testing::Test,
     registrar_.RemoveAll();
   }
 
+  DomainReliabilityMonitor *UseProfileWithDomainReliabilityMonitor() {
+    TestingProfileWithDomainReliabilityMonitor* new_profile =
+        new TestingProfileWithDomainReliabilityMonitor();
+    DomainReliabilityMonitor* monitor = new_profile->monitor();
+    profile_.reset(new_profile);
+    return monitor;
+  }
+
  protected:
   scoped_ptr<BrowsingDataRemover::NotificationDetails> called_with_details_;
 
@@ -1604,3 +1637,26 @@ TEST_F(BrowsingDataRemoverTest, ContentProtectionPlatformKeysRemoval) {
   chromeos::DBusThreadManager::Shutdown();
 }
 #endif
+
+TEST_F(BrowsingDataRemoverTest, ClearDomainReliabilityMonitor_Null) {
+  DomainReliabilityMonitor* monitor = UseProfileWithDomainReliabilityMonitor();
+  EXPECT_FALSE(monitor->was_cleared_for_testing());
+}
+
+TEST_F(BrowsingDataRemoverTest, ClearDomainReliabilityMonitor_Beacons) {
+  DomainReliabilityMonitor* monitor = UseProfileWithDomainReliabilityMonitor();
+  BlockUntilBrowsingDataRemoved(
+      BrowsingDataRemover::EVERYTHING,
+      BrowsingDataRemover::REMOVE_HISTORY, false);
+  EXPECT_TRUE(monitor->was_cleared_for_testing());
+  EXPECT_EQ(CLEAR_BEACONS, monitor->cleared_mode_for_testing());
+}
+
+TEST_F(BrowsingDataRemoverTest, ClearDomainReliabilityMonitor_Contexts) {
+  DomainReliabilityMonitor* monitor = UseProfileWithDomainReliabilityMonitor();
+  BlockUntilBrowsingDataRemoved(
+      BrowsingDataRemover::EVERYTHING,
+      BrowsingDataRemover::REMOVE_COOKIES, false);

[Mike West, 2014/05/08 11:00:40]

Could you add a test with the protected origins flag set to true?

[Deprecated (see juliatuttle), 2014/05/08 15:47:39]

Done.

+  EXPECT_TRUE(monitor->was_cleared_for_testing());
+  EXPECT_EQ(CLEAR_CONTEXTS, monitor->cleared_mode_for_testing());
+}