Move creation of the PrefStores into the PrefValueStore, to reduce the knowle...

chrome/browser/pref_service.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/pref_service.h"
 
 #include <algorithm>
 #include <string>
 
 #include "app/l10n_util.h"
 #include "base/command_line.h"
 #include "base/histogram.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/stl_util-inl.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "base/sys_string_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "chrome/browser/chrome_thread.h"
+#include "chrome/browser/configuration_policy_pref_store.h"
 #include "chrome/browser/profile.h"
-#include "chrome/browser/command_line_pref_store.h"
-#include "chrome/browser/configuration_policy_pref_store.h"
-#include "chrome/browser/extensions/extension_pref_store.h"
-#include "chrome/common/json_pref_store.h"
 #include "chrome/common/notification_service.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 
 namespace {
 
 // A helper function for RegisterLocalized*Pref that creates a Value* based on
 // the string value in the locale dll.  Because we control the values in a
 // locale dll, this should always return a Value of the appropriate type.
 Value* CreateLocaleDefaultValue(Value::ValueType type, int message_id) {
@@ skipping 39 matching lines @@
   Source<PrefService> source(pref);
   NotificationService::current()->Notify(NotificationType::PROFILE_ERROR,
                                          source, Details<int>(&message_id));
 }
 
 }  // namespace
 
 // static
 PrefService* PrefService::CreatePrefService(const FilePath& pref_filename,
                                             Profile* profile) {
-  ExtensionPrefStore* extension_prefs = new ExtensionPrefStore(profile);
-  CommandLinePrefStore* command_line_prefs = new CommandLinePrefStore(
-      CommandLine::ForCurrentProcess());
-  PrefStore* local_prefs = new JsonPrefStore(
-      pref_filename,
-      ChromeThread::GetMessageLoopProxyForThread(ChromeThread::FILE));
-
-  // The PrefValueStore takes ownership of the PrefStores.
-  PrefValueStore* value_store = new PrefValueStore(
-      ConfigurationPolicyPrefStore::CreateManagedPolicyPrefStore(),
-      extension_prefs,
-      command_line_prefs,
-      local_prefs,
-      ConfigurationPolicyPrefStore::CreateRecommendedPolicyPrefStore());
-
-  return new PrefService(value_store);
+  return new PrefService(
+      PrefValueStore::CreatePrefValueStore(pref_filename, profile, false));
 }
 
 // static
-PrefService* PrefService::CreateUserPrefService(
-    const FilePath& pref_filename) {
-  PrefValueStore* value_store = new PrefValueStore(
-      NULL, /* no enforced prefs */
-      NULL, /* no extension prefs */
-      NULL, /* no command-line prefs */
-      new JsonPrefStore(
-          pref_filename,
-          ChromeThread::GetMessageLoopProxyForThread(ChromeThread::FILE)),
-          /* user prefs */
-      NULL /* no advised prefs */);
-  return new PrefService(value_store);
+PrefService* PrefService::CreateUserPrefService(const FilePath& pref_filename) {
+  return new PrefService(
+      PrefValueStore::CreatePrefValueStore(pref_filename, NULL, true));
 }
 
 PrefService::PrefService(PrefValueStore* pref_value_store)
     : pref_value_store_(pref_value_store) {
   InitFromStorage();
   registrar_.Add(this,
                  NotificationType(NotificationType::POLICY_CHANGED),
                  NotificationService::AllSources());
 }
 
@@ skipping 730 matching lines @@
       ChromeThread::PostTask(
           ChromeThread::UI, FROM_HERE,
           NewRunnableMethod(
               pref_value_store_.get(),
               &PrefValueStore::RefreshPolicyPrefs,
               ConfigurationPolicyPrefStore::CreateManagedPolicyPrefStore(),
               ConfigurationPolicyPrefStore::CreateRecommendedPolicyPrefStore(),
               callback));
   }
 }