Introduce per-tab preferences service.

chrome/browser/prefs/pref_service_mock_builder.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_service_mock_builder.h"
 
 #include "chrome/browser/policy/configuration_policy_pref_store.h"
 #include "chrome/browser/prefs/command_line_pref_store.h"
 #include "chrome/browser/prefs/default_pref_store.h"
+#include "chrome/browser/prefs/pref_model_associator.h"
+#include "chrome/browser/prefs/pref_notifier_impl.h"
+#include "chrome/browser/prefs/pref_value_store.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/prefs/testing_pref_store.h"
 #include "chrome/common/json_pref_store.h"
 #include "content/public/browser/browser_thread.h"
 
 using content::BrowserThread;
 
 PrefServiceMockBuilder::PrefServiceMockBuilder()
   : user_prefs_(new TestingPrefStore) {
 }
@@ skipping 82 matching lines @@
 PrefServiceMockBuilder&
 PrefServiceMockBuilder::WithUserFilePrefs(const FilePath& prefs_file) {
   user_prefs_ =
       new JsonPrefStore(prefs_file,
                         BrowserThread::GetMessageLoopProxyForThread(
                             BrowserThread::FILE));
   return *this;
 }
 
 PrefService* PrefServiceMockBuilder::Create() {
+  DefaultPrefStore* default_pref_store = new DefaultPrefStore();
+  PrefNotifierImpl* pref_notifier = new PrefNotifierImpl();
+  PrefModelAssociator* pref_sync_associator = new PrefModelAssociator();

[Mattias Nissler (ping if slow), 2011/11/18 14:57:07]

Any reason not to make the associator NULL in this case?

[mnaganov (inactive), 2011/11/21 14:52:20]

In the old code, only the Incognito mode constructor was passing a NULL
associator. I was trying to preserve this. Now removing.

[Mattias Nissler (ping if slow), 2011/11/21 15:12:37]

You only need the associator for syncing stuff to the cloud. Actually, having
more than one associator on the same profile (as would be the case for the
per-tab PrefService) would probably thrash values in the best case and crash the
browser in the worst case :)

   PrefService* pref_service =
-      new PrefService(managed_platform_prefs_.get(),
-                      managed_cloud_prefs_.get(),
-                      extension_prefs_.get(),
-                      command_line_prefs_.get(),
-                      user_prefs_.get(),
-                      recommended_platform_prefs_.get(),
-                      recommended_cloud_prefs_.get(),
-                      new DefaultPrefStore(),
-                      false);
+      new PrefService(
+          pref_notifier,
+          user_prefs_.get(),
+          default_pref_store,
+          pref_sync_associator,
+          new PrefValueStore(
+              managed_platform_prefs_.get(),
+              managed_cloud_prefs_.get(),
+              extension_prefs_.get(),
+              command_line_prefs_.get(),
+              user_prefs_.get(),
+              recommended_platform_prefs_.get(),
+              recommended_cloud_prefs_.get(),
+              default_pref_store,
+              pref_sync_associator,
+              pref_notifier),
+          false);
   managed_platform_prefs_ = NULL;
   managed_cloud_prefs_ = NULL;
   extension_prefs_ = NULL;
   command_line_prefs_ = NULL;
   user_prefs_ = NULL;
   recommended_platform_prefs_ = NULL;
   recommended_cloud_prefs_ = NULL;
   user_prefs_ = new TestingPrefStore;
   return pref_service;
 }