Revert of Pref service: add support for tracked prefs.

services/preferences/tracked/pref_hash_filter_unittest.cc

Index: services/preferences/tracked/pref_hash_filter_unittest.cc
diff --git a/services/preferences/tracked/pref_hash_filter_unittest.cc b/services/preferences/tracked/pref_hash_filter_unittest.cc
index 5c288dcc77d07ad446af259f021c4531c04bb14b..59bdf9819de4c9076c9a5b9088507f9ff3878b0b 100644
--- a/services/preferences/tracked/pref_hash_filter_unittest.cc
+++ b/services/preferences/tracked/pref_hash_filter_unittest.cc
@@ -19,14 +19,11 @@
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
-#include "base/message_loop/message_loop.h"
 #include "base/metrics/histogram_base.h"
 #include "base/metrics/histogram_samples.h"
 #include "base/metrics/statistics_recorder.h"
-#include "base/run_loop.h"
 #include "base/values.h"
 #include "components/prefs/testing_pref_store.h"
-#include "mojo/public/cpp/bindings/binding_set.h"
 #include "services/preferences/public/cpp/tracked/configuration.h"
 #include "services/preferences/public/cpp/tracked/mock_validation_delegate.h"
 #include "services/preferences/public/cpp/tracked/pref_names.h"
@@ -544,8 +541,7 @@
   ADD_FAILURE() << "Unexpected call.";
 }
 
-class PrefHashFilterTest : public testing::TestWithParam<EnforcementLevel>,
-                           public prefs::mojom::ResetOnLoadObserver {
+class PrefHashFilterTest : public testing::TestWithParam<EnforcementLevel> {
  public:
   PrefHashFilterTest()
       : mock_pref_hash_store_(NULL),
@@ -589,14 +585,13 @@
             std::move(temp_mock_external_validation_pref_hash_store),
             std::move(temp_mock_external_validation_hash_store_contents)),
         std::move(configuration),
-        reset_on_load_observer_bindings_.CreateInterfacePtrAndBind(this),
+        base::Bind(&PrefHashFilterTest::RecordReset, base::Unretained(this)),
         &mock_validation_delegate_, arraysize(kTestTrackedPrefs), true));
   }
 
   // Verifies whether a reset was reported by the PrefHashFiler. Also verifies
   // that kPreferenceResetTime was set (or not) accordingly.
   void VerifyRecordedReset(bool reset_expected) {
-    base::RunLoop().RunUntilIdle();
     EXPECT_EQ(reset_expected, reset_recorded_);
     EXPECT_EQ(reset_expected, pref_store_contents_->Get(
                                   user_prefs::kPreferenceResetTime, NULL));
@@ -631,17 +626,14 @@
     EXPECT_EQ(expected_schedule_write, schedule_write);
   }
 
-  void OnResetOnLoad() override {
+  void RecordReset() {
     // As-is |reset_recorded_| is only designed to remember a single reset, make
     // sure none was previously recorded.
     EXPECT_FALSE(reset_recorded_);
     reset_recorded_ = true;
   }
 
-  base::MessageLoop message_loop_;
   MockValidationDelegate mock_validation_delegate_;
-  mojo::BindingSet<prefs::mojom::ResetOnLoadObserver>
-      reset_on_load_observer_bindings_;
   bool reset_recorded_;
 
   DISALLOW_COPY_AND_ASSIGN(PrefHashFilterTest);