Domain Reliability: Default to enabled

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 7d1e71ad131274625d302ed07cbbd9c962c156a8..61f325a3af351163c3880f603b6371c110742c09 100644
--- a/chrome/browser/browsing_data/browsing_data_remover_unittest.cc
+++ b/chrome/browser/browsing_data/browsing_data_remover_unittest.cc
@@ -667,9 +667,9 @@ class ClearDomainReliabilityTester {
     AttachService();
   }
 
-  unsigned clear_count() { return mock_service_->clear_count(); }
+  unsigned clear_count() const { return mock_service_->clear_count(); }
 
-  DomainReliabilityClearMode last_clear_mode() {
+  DomainReliabilityClearMode last_clear_mode() const {
     return mock_service_->last_clear_mode();
   }
 
@@ -703,7 +703,9 @@ class ClearDomainReliabilityTester {
 
 class BrowsingDataRemoverTest : public testing::Test {
  public:
-  BrowsingDataRemoverTest() : profile_(new TestingProfile()) {
+  BrowsingDataRemoverTest()
+      : profile_(new TestingProfile()),
+        clear_domain_reliability_tester_(GetProfile()) {
     callback_subscription_ =
         BrowsingDataRemover::RegisterOnBrowsingDataRemovedCallback(
             base::Bind(&BrowsingDataRemoverTest::NotifyWithDetails,
@@ -724,6 +726,8 @@ class BrowsingDataRemoverTest : public testing::Test {
     // Otherwise we leak memory.
     profile_.reset();
     base::MessageLoop::current()->RunUntilIdle();
+
+    TestingBrowserProcess::GetGlobal()->SetLocalState(NULL);
   }
 
   void BlockUntilBrowsingDataRemoved(BrowsingDataRemover::TimePeriod period,
@@ -831,6 +835,10 @@ class BrowsingDataRemoverTest : public testing::Test {
 #endif
   }
 
+  const ClearDomainReliabilityTester& clear_domain_reliability_tester() {
+    return clear_domain_reliability_tester_;
+  }
+
  protected:
   scoped_ptr<BrowsingDataRemover::NotificationDetails> called_with_details_;
 
@@ -846,6 +854,9 @@ class BrowsingDataRemoverTest : public testing::Test {
 
   BrowsingDataRemover::CallbackSubscription callback_subscription_;
 
+  // Needed to mock out DomainReliabilityService, even for unrelated tests.
+  ClearDomainReliabilityTester clear_domain_reliability_tester_;
+
   DISALLOW_COPY_AND_ASSIGN(BrowsingDataRemoverTest);
 };
 
@@ -1772,13 +1783,15 @@ TEST_F(BrowsingDataRemoverTest, ContentProtectionPlatformKeysRemoval) {
 #endif
 
 TEST_F(BrowsingDataRemoverTest, DomainReliability_Null) {
-  ClearDomainReliabilityTester tester(GetProfile());
+  const ClearDomainReliabilityTester& tester =
+      clear_domain_reliability_tester();
 
   EXPECT_EQ(0u, tester.clear_count());
 }
 
 TEST_F(BrowsingDataRemoverTest, DomainReliability_Beacons) {
-  ClearDomainReliabilityTester tester(GetProfile());
+  const ClearDomainReliabilityTester& tester =
+      clear_domain_reliability_tester();
 
   BlockUntilBrowsingDataRemoved(
       BrowsingDataRemover::EVERYTHING,
@@ -1788,7 +1801,8 @@ TEST_F(BrowsingDataRemoverTest, DomainReliability_Beacons) {
 }
 
 TEST_F(BrowsingDataRemoverTest, DomainReliability_Contexts) {
-  ClearDomainReliabilityTester tester(GetProfile());
+  const ClearDomainReliabilityTester& tester =
+      clear_domain_reliability_tester();
 
   BlockUntilBrowsingDataRemoved(
       BrowsingDataRemover::EVERYTHING,
@@ -1798,7 +1812,8 @@ TEST_F(BrowsingDataRemoverTest, DomainReliability_Contexts) {
 }
 
 TEST_F(BrowsingDataRemoverTest, DomainReliability_ContextsWin) {
-  ClearDomainReliabilityTester tester(GetProfile());
+  const ClearDomainReliabilityTester& tester =
+      clear_domain_reliability_tester();
 
   BlockUntilBrowsingDataRemoved(
       BrowsingDataRemover::EVERYTHING,
@@ -1809,7 +1824,8 @@ TEST_F(BrowsingDataRemoverTest, DomainReliability_ContextsWin) {
 }
 
 TEST_F(BrowsingDataRemoverTest, DomainReliability_ProtectedOrigins) {
-  ClearDomainReliabilityTester tester(GetProfile());
+  const ClearDomainReliabilityTester& tester =
+      clear_domain_reliability_tester();
 
   BlockUntilBrowsingDataRemoved(
       BrowsingDataRemover::EVERYTHING,
@@ -1818,7 +1834,11 @@ TEST_F(BrowsingDataRemoverTest, DomainReliability_ProtectedOrigins) {
   EXPECT_EQ(CLEAR_CONTEXTS, tester.last_clear_mode());
 }
 
-TEST_F(BrowsingDataRemoverTest, DomainReliability_NoMonitor) {
+// TODO(ttuttle): This isn't actually testing the no-monitor case, since
+// BrowsingDataRemoverTest now creates one unconditionally, since it's needed
+// for some unrelated test cases. This should be fixed so it tests the no-
+// monitor case again.
+TEST_F(BrowsingDataRemoverTest, DISABLED_DomainReliability_NoMonitor) {
   BlockUntilBrowsingDataRemoved(
       BrowsingDataRemover::EVERYTHING,
       BrowsingDataRemover::REMOVE_HISTORY |