Remove PrefValueStore's dependency on PrefModelAssociator.

chrome/browser/prefs/pref_value_store_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <string>
 
+#include "base/bind.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/prefs/pref_notifier.h"
 #include "base/prefs/testing_pref_store.h"
 #include "base/values.h"
-#include "chrome/browser/prefs/pref_model_associator.h"
 #include "chrome/browser/prefs/pref_value_store.h"
 #include "chrome/common/pref_names.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using testing::Mock;
 using testing::_;
 
 namespace {
 
 // Allows to capture pref notifications through gmock.
 class MockPrefNotifier : public PrefNotifier {
  public:
   MOCK_METHOD1(OnPreferenceChanged, void(const std::string&));
   MOCK_METHOD1(OnInitializationCompleted, void(bool));
 };
 
 // Allows to capture sync model associator interaction.
-class MockPrefModelAssociator : public PrefModelAssociator {
+class MockPrefModelAssociator {
  public:
   MOCK_METHOD1(ProcessPrefChange, void(const std::string&));
 };
 
 }  // namespace
 
 // Names of the preferences used in this test.
 namespace prefs {
 const char kManagedPref[] = "this.pref.managed";
 const char kCommandLinePref[] = "this.pref.command_line";
@@ skipping 59 matching lines @@
     // Create a fresh PrefValueStore.
     pref_value_store_.reset(new PrefValueStore(
         managed_pref_store_,
         extension_pref_store_,
         command_line_pref_store_,
         user_pref_store_,
         recommended_pref_store_,
         default_pref_store_,
         &pref_notifier_));
 
-    pref_value_store_->set_sync_associator(sync_associator_.get());
+    pref_value_store_->set_callback(
+        base::Bind(&MockPrefModelAssociator::ProcessPrefChange,
+                   base::Unretained(sync_associator_.get())));
   }
 
   void CreateManagedPrefs() {
     managed_pref_store_ = new TestingPrefStore;
     managed_pref_store_->SetString(
         prefs::kManagedPref,
         managed_pref::kManagedValue);
   }
 
   void CreateExtensionPrefs() {
@@ skipping 461 matching lines @@
       prefs::kCommandLinePref));
   EXPECT_TRUE(pref_value_store_->PrefValueExtensionModifiable(
       prefs::kUserPref));
   EXPECT_TRUE(pref_value_store_->PrefValueExtensionModifiable(
       prefs::kRecommendedPref));
   EXPECT_TRUE(pref_value_store_->PrefValueExtensionModifiable(
       prefs::kDefaultPref));
   EXPECT_TRUE(pref_value_store_->PrefValueExtensionModifiable(
       prefs::kMissingPref));
 }