Introduce per-tab preferences service.

chrome/browser/prefs/pref_notifier_impl.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_notifier_impl.h"
 
 #include "base/stl_util.h"
+#include "chrome/browser/prefs/pref_model_associator.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_service.h"
 
-PrefNotifierImpl::PrefNotifierImpl(PrefService* service)
-    : pref_service_(service) {
+PrefNotifierImpl::PrefNotifierImpl()
+    : pref_service_(NULL),
+      pref_model_associator_(NULL) {
 }
 
 PrefNotifierImpl::~PrefNotifierImpl() {
   DCHECK(CalledOnValidThread());
 
   // Verify that there are no pref observers when we shut down.
   for (PrefObserverMap::iterator it = pref_observers_.begin();
        it != pref_observers_.end(); ++it) {
     NotificationObserverList::Iterator obs_iterator(*(it->second));
     if (obs_iterator.GetNext()) {
@@ skipping 56 matching lines @@
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_PREF_INITIALIZATION_COMPLETED,
       content::Source<PrefService>(pref_service_),
       content::Details<bool>(&succeeded));
 }
 
 void PrefNotifierImpl::FireObservers(const std::string& path) {
   DCHECK(CalledOnValidThread());
 
   // Only send notifications for registered preferences.
-  if (!pref_service_->FindPreference(path.c_str()))
+  if (!pref_service_ || !pref_service_->FindPreference(path.c_str()))
     return;
 
+  if (pref_model_associator_)
+    pref_model_associator_->ProcessPrefChange(path);

[Mattias Nissler (ping if slow), 2011/11/16 12:08:04]

Seems like this now duplicates the same thing in
PrefValueStore::NotifyPrefChanged(). I'm happy if you move the functionality
here, but then please remove the reference to the associator from
PrefValueStore.

[mnaganov (inactive), 2011/11/17 16:50:58]

Right. I haven't understood that from your change. But it looks like removing an
associator from value store requires cascading changes in tests, so let's do it
as a separate change. For now, I'm not adding an associator into notifier.

+
   const PrefObserverMap::iterator observer_iterator =
       pref_observers_.find(path);
   if (observer_iterator == pref_observers_.end())
     return;
 
   NotificationObserverList::Iterator it(*(observer_iterator->second));
   content::NotificationObserver* observer;
   while ((observer = it.GetNext()) != NULL) {
     observer->Observe(chrome::NOTIFICATION_PREF_CHANGED,
                       content::Source<PrefService>(pref_service_),
                       content::Details<const std::string>(&path));
   }
 }
+
+void PrefNotifierImpl::SetPrefModelAssociator(
+    PrefModelAssociator* pref_model_associator) {
+  DCHECK(pref_model_associator_ == NULL);
+  pref_model_associator_ = pref_model_associator;
+}
+
+void PrefNotifierImpl::SetPrefService(PrefService* pref_service) {
+  DCHECK(pref_service_ == NULL);
+  pref_service_ = pref_service;
+}