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

chrome/browser/pref_value_store.h

 // 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.
 
 #ifndef CHROME_BROWSER_PREF_VALUE_STORE_H_
 #define CHROME_BROWSER_PREF_VALUE_STORE_H_
 #pragma once
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/file_path.h"
 #include "base/gtest_prod_util.h"
 #include "base/ref_counted.h"
 #include "base/string16.h"
 #include "base/scoped_ptr.h"
 #include "base/values.h"
 #include "chrome/browser/chrome_thread.h"
 #include "chrome/common/pref_store.h"
 
 class PrefStore;
+class Profile;
 
 // The class PrefValueStore provides values for preferences. Each Preference
 // has a unique name. This name is used to retrieve the value of a Preference.
 // The value of a preference can be either managed, user-defined or recommended.
 // Managed preference values are set (managed) by a third person (like an
 // admin for example). They have the highest priority and can not be
 // altered by the user.
 // User-defined values are chosen by the user. If there is already
 // a managed value for a preference the user-defined value is ignored and
 // the managed value is used (returned).
 // Otherwise user-defined values have a higher precedence than recommended
 // values. Recommended preference values are set by a third person
 // (like an admin).
 // Unless otherwise explicitly noted, all of the methods of this class must
 // be called on the UI thread.
 class PrefValueStore : public base::RefCountedThreadSafe<PrefValueStore> {
  public:
-  // In decreasing order of precedence:
-  //   |managed_prefs| contains all managed (policy) preference values.
-  //   |extension_prefs| contains preference values set by extensions.
-  //   |command_line_prefs| contains preference values set by command-line
-  //        switches.
-  //   |user_prefs| contains all user-set preference values.
-  //   |recommended_prefs| contains all recommended (policy) preference values.
-  PrefValueStore(PrefStore* managed_prefs,
-                 PrefStore* extension_prefs,
-                 PrefStore* command_line_prefs,
-                 PrefStore* user_prefs,
-                 PrefStore* recommended_prefs);
+  ~PrefValueStore();
 
-  ~PrefValueStore();
+  // Returns a new PrefValueStore with all applicable PrefStores. The
+  // |pref_filename| points to the user preference file. The |profile| is the
+  // one to which these preferences apply; it may be NULL if we're dealing
+  // with the local state. If |pref_filename| is empty, the user PrefStore will
+  // not be created. If |user_only| is true, no PrefStores will be created
+  // other than the user PrefStore (if |pref_filename| is not empty). This
+  // should not be called directly. The usual way to create a PrefValueStore is
+  // by creating a PrefService.
+  static PrefValueStore* CreatePrefValueStore(const FilePath& pref_filename,
+                                              Profile* profile,
+                                              bool user_only);
 
   // Get the preference value for the given preference name.
   // Return true if a value for the given preference name was found.
   bool GetValue(const std::wstring& name, Value** out_value) const;
 
   // Read preference values into the three PrefStores so that they are available
   // through the GetValue method. Return the first error that occurs (but
   // continue reading the remaining PrefStores).
   PrefStore::PrefReadError ReadPrefs();
 
@@ skipping 55 matching lines @@
   // new, uninitialized managed and recommended PrefStores in
   // |managed_pref_store| and |recommended_pref_store| respectively, since
   // PrefValueStore doesn't know about policy-specific PrefStores.
   // |callback| is called with the set of preferences changed by the policy
   // refresh. |callback| is called the caller's thread as a Task
   // after RefreshPolicyPrefs has returned.
   void RefreshPolicyPrefs(PrefStore* managed_pref_store,
                           PrefStore* recommended_pref_store,
                           AfterRefreshCallback callback);
 
+ protected:
+  // In decreasing order of precedence:
+  //   |managed_prefs| contains all managed (policy) preference values.
+  //   |extension_prefs| contains preference values set by extensions.
+  //   |command_line_prefs| contains preference values set by command-line
+  //        switches.
+  //   |user_prefs| contains all user-set preference values.
+  //   |recommended_prefs| contains all recommended (policy) preference values.
+  //
+  // This constructor should only be used by subclasses in testing. The usual

[Mattias Nissler (ping if slow), 2010/08/06 07:29:42]

nit: It's also used for creating the actual PrefValueStore.

+  // way to create a PrefValueStore is by creating a PrefService.
+  PrefValueStore(PrefStore* managed_prefs,
+                 PrefStore* extension_prefs,
+                 PrefStore* command_line_prefs,
+                 PrefStore* user_prefs,
+                 PrefStore* recommended_prefs);
+
  private:
   friend class PrefValueStoreTest;
   FRIEND_TEST_ALL_PREFIXES(PrefValueStoreTest,
                            TestRefreshPolicyPrefsCompletion);
 
   // PrefStores must be listed here in order from highest to lowest priority.
   enum PrefStoreType {
     // Not associated with an actual PrefStore but used as invalid marker, e.g.
     // as return value.
     INVALID = -1,
@@ skipping 25 matching lines @@
   void RefreshPolicyPrefsOnFileThread(
       ChromeThread::ID calling_thread_id,
       PrefStore* new_managed_pref_store,
       PrefStore* new_recommended_pref_store,
       AfterRefreshCallback callback);
 
   DISALLOW_COPY_AND_ASSIGN(PrefValueStore);
 };
 
 #endif  // CHROME_BROWSER_PREF_VALUE_STORE_H_