Introduce per-tab preferences service.

chrome/browser/prefs/pref_model_associator.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 "chrome/browser/prefs/pref_model_associator.h"
 
 #include "base/auto_reset.h"
 #include "base/json/json_reader.h"
 #include "base/json/json_value_serializer.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/sync/api/sync_change.h"
 #include "chrome/browser/sync/protocol/preference_specifics.pb.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/pref_names.h"
 
 using syncable::PREFERENCES;
 
 PrefModelAssociator::PrefModelAssociator()
     : models_associated_(false),
       processing_syncer_changes_(false),
       pref_service_(NULL),
       sync_processor_(NULL) {
-}
-
-PrefModelAssociator::PrefModelAssociator(
-    PrefService* pref_service)
-    : models_associated_(false),
-      processing_syncer_changes_(false),
-      pref_service_(pref_service),
-      sync_processor_(NULL) {
   DCHECK(CalledOnValidThread());
 }
 
 PrefModelAssociator::~PrefModelAssociator() {
   DCHECK(CalledOnValidThread());
   sync_processor_ = NULL;
   pref_service_ = NULL;
 }
 
 void PrefModelAssociator::InitPrefAndAssociate(
@@ skipping 68 matching lines @@
   synced_preferences_.insert(pref_name);
   return;
 }
 
 SyncError PrefModelAssociator::MergeDataAndStartSyncing(
     syncable::ModelType type,
     const SyncDataList& initial_sync_data,
     SyncChangeProcessor* sync_processor) {
   DCHECK_EQ(type, PREFERENCES);
   DCHECK(CalledOnValidThread());
+  DCHECK(pref_service_);
   DCHECK(!sync_processor_);
   sync_processor_ = sync_processor;
 
   SyncChangeList new_changes;
   std::set<std::string> remaining_preferences = registered_preferences_;
 
   // Go through and check for all preferences we care about that sync already
   // knows about.
   for (SyncDataList::const_iterator sync_iter = initial_sync_data.begin();
        sync_iter != initial_sync_data.end();
@@ skipping 291 matching lines @@
       return;
     }
     changes.push_back(SyncChange(SyncChange::ACTION_UPDATE, sync_data));
   }
 
   SyncError error =
       sync_processor_->ProcessSyncChanges(FROM_HERE, changes);
   if (error.IsSet())
     StopSyncing(PREFERENCES);
 }
+
+void PrefModelAssociator::SetPrefService(PrefService* pref_service) {
+  DCHECK(pref_service_ == NULL);
+  pref_service_ = pref_service;
+}