Add support for a managed user pref store to PrefService.

base/prefs/pref_service_builder.cc

 // Copyright (c) 2012 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 "base/prefs/pref_service_builder.h"
 
 #include "base/bind.h"
 #include "base/prefs/default_pref_store.h"
 #include "base/prefs/json_pref_store.h"
 #include "base/prefs/pref_notifier_impl.h"
@@ skipping 14 matching lines @@
 }
 
 PrefServiceBuilder::~PrefServiceBuilder() {
 }
 
 PrefServiceBuilder& PrefServiceBuilder::WithManagedPrefs(PrefStore* store) {
   managed_prefs_ = store;
   return *this;
 }
 
+PrefServiceBuilder& PrefServiceBuilder::WithManagedUserPrefs(PrefStore* store) {
+  managed_user_prefs_ = store;
+  return *this;
+}
+
 PrefServiceBuilder& PrefServiceBuilder::WithExtensionPrefs(PrefStore* store) {
   extension_prefs_ = store;
   return *this;
 }
 
 PrefServiceBuilder& PrefServiceBuilder::WithCommandLinePrefs(PrefStore* store) {
   command_line_prefs_ = store;
   return *this;
 }
 
@@ skipping 25 matching lines @@
 PrefServiceBuilder& PrefServiceBuilder::WithAsync(bool async) {
   async_ = async;
   return *this;
 }
 
 PrefService* PrefServiceBuilder::Create(PrefRegistry* pref_registry) {
   PrefNotifierImpl* pref_notifier = new PrefNotifierImpl();
   PrefService* pref_service =
       new PrefService(pref_notifier,
                       new PrefValueStore(managed_prefs_.get(),
+                                         managed_user_prefs_.get(),
                                          extension_prefs_.get(),
                                          command_line_prefs_.get(),
                                          user_prefs_.get(),
                                          recommended_prefs_.get(),
                                          pref_registry->defaults().get(),
                                          pref_notifier),
                       user_prefs_.get(),
                       pref_registry,
                       read_error_callback_,
                       async_);
   ResetDefaultState();
   return pref_service;
 }
 
 void PrefServiceBuilder::ResetDefaultState() {
   managed_prefs_ = NULL;
+  managed_user_prefs_ = NULL;
   extension_prefs_ = NULL;
   command_line_prefs_ = NULL;
   user_prefs_ = NULL;
   recommended_prefs_ = NULL;
   read_error_callback_ = base::Bind(&DoNothingHandleReadError);
   async_ = false;
 }