Introduce PrefRegistrySyncable, simplifying PrefServiceSyncable.

chrome/browser/prefs/scoped_user_pref_update_unittest.cc

 // Copyright (c) 2011 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 "base/prefs/public/pref_change_registrar.h"
 #include "chrome/browser/prefs/mock_pref_change_callback.h"
+#include "chrome/browser/prefs/pref_registry_syncable.h"
 #include "chrome/browser/prefs/scoped_user_pref_update.h"
 #include "chrome/test/base/testing_pref_service.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using testing::_;
 using testing::Mock;
 
 class ScopedUserPrefUpdateTest : public testing::Test {
  public:
   ScopedUserPrefUpdateTest() : observer_(&prefs_) {}
   virtual ~ScopedUserPrefUpdateTest() {}
 
  protected:
   virtual void SetUp() {
-    prefs_.RegisterDictionaryPref(kPref,
-                                  PrefServiceSyncable::UNSYNCABLE_PREF);
+    prefs_.registry()->RegisterDictionaryPref(
+        kPref,
+        PrefRegistrySyncable::UNSYNCABLE_PREF);
     registrar_.Init(&prefs_);
     registrar_.Add(kPref, observer_.GetCallback());
   }
 
   static const char kPref[];
   static const char kKey[];
   static const char kValue[];
 
   TestingPrefServiceSyncable prefs_;
   MockPrefChangeCallback observer_;
@@ skipping 38 matching lines @@
 TEST_F(ScopedUserPrefUpdateTest, NeverTouchAnything) {
   const DictionaryValue* old_value = prefs_.GetDictionary(kPref);
   EXPECT_CALL(observer_, OnPreferenceChanged(_)).Times(0);
   {
     DictionaryPrefUpdate update(&prefs_, kPref);
   }
   const DictionaryValue* new_value = prefs_.GetDictionary(kPref);
   EXPECT_EQ(old_value, new_value);
   Mock::VerifyAndClearExpectations(&observer_);
 }