Use PrefChangeRegistrar everywhere

chrome/browser/sync/glue/preference_change_processor.cc

 // Copyright (c) 2010 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 "chrome/browser/sync/glue/preference_change_processor.h"
 
 #include <set>
 #include <string>
 
 #include "base/auto_reset.h"
@@ skipping 177 matching lines @@
     error_handler()->OnUnrecoverableError(FROM_HERE, err);
     return NULL;
   }
   *name = preference.name();
   return value.release();
 }
 
 void PreferenceChangeProcessor::StartImpl(Profile* profile) {
   DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI));
   pref_service_ = profile->GetPrefs();
+  registrar_.Init(pref_service_);
   StartObserving();
 }
 
 void PreferenceChangeProcessor::StopImpl() {
   DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI));
   StopObserving();
   pref_service_ = NULL;
 }
 
 
 void PreferenceChangeProcessor::StartObserving() {
   DCHECK(pref_service_);
   for (std::set<std::string>::const_iterator it =
       model_associator_->synced_preferences().begin();
       it != model_associator_->synced_preferences().end(); ++it) {
-    pref_service_->AddPrefObserver((*it).c_str(), this);
+    registrar_.Add((*it).c_str(), this);
   }
 }
 
 void PreferenceChangeProcessor::StopObserving() {
   DCHECK(pref_service_);
   for (std::set<std::string>::const_iterator it =
       model_associator_->synced_preferences().begin();
       it != model_associator_->synced_preferences().end(); ++it) {
-    pref_service_->RemovePrefObserver((*it).c_str(), this);
+    registrar_.Remove((*it).c_str(), this);
   }
 }
 
 }  // namespace browser_sync