Fix for Bug 50726 "Save extension list and "winning" prefs from extensions"

chrome/browser/prefs/pref_value_store.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/prefs/pref_value_store.h"
 
 #include "chrome/browser/browser_thread.h"
-#include "chrome/browser/extensions/extension_pref_store.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/in_memory_pref_store.h"
 #include "chrome/common/json_pref_store.h"
 #include "chrome/common/notification_service.h"
 
 namespace {
 
 // Returns true if the actual value is a valid type for the expected type when
 // found in the given store.
 bool IsValidType(Value::ValueType expected, Value::ValueType actual,
                  PrefNotifier::PrefStoreType store) {
   if (expected == actual)
@@ skipping 12 matching lines @@
 }  // namespace
 
 // static
 PrefValueStore* PrefValueStore::CreatePrefValueStore(
     const FilePath& pref_filename,
     Profile* profile,
     bool user_only) {
   using policy::ConfigurationPolicyPrefStore;
   ConfigurationPolicyPrefStore* managed = NULL;
   ConfigurationPolicyPrefStore* device_management = NULL;
-  ExtensionPrefStore* extension = NULL;
+  InMemoryPrefStore* extension = NULL;
   CommandLinePrefStore* command_line = NULL;
   ConfigurationPolicyPrefStore* recommended = NULL;
 
   JsonPrefStore* user = new JsonPrefStore(
       pref_filename,
       BrowserThread::GetMessageLoopProxyForThread(BrowserThread::FILE));
-  DefaultPrefStore* default_store = new DefaultPrefStore();
+  InMemoryPrefStore* default_store = new InMemoryPrefStore();
 
   if (!user_only) {
     managed =
         ConfigurationPolicyPrefStore::CreateManagedPlatformPolicyPrefStore();
     device_management =
         ConfigurationPolicyPrefStore::CreateDeviceManagementPolicyPrefStore();
-    extension = new ExtensionPrefStore(profile, PrefNotifier::EXTENSION_STORE);
+    extension = new InMemoryPrefStore;

[Mattias Nissler (ping if slow), 2010/11/19 10:47:40]

This one has no parens, but the one above has. There is no fixed convention for
this in the code base, but I feel you should try and be consistent within a
patch or file.

[battre (please use the other), 2010/11/19 16:03:18]

Done.

     command_line = new CommandLinePrefStore(CommandLine::ForCurrentProcess());
     recommended =
         ConfigurationPolicyPrefStore::CreateRecommendedPolicyPrefStore();
   }
   return new PrefValueStore(managed, device_management, extension,
                             command_line, user, recommended, default_store);
 }
 
 PrefValueStore::~PrefValueStore() {}
 
@@ skipping 76 matching lines @@
 
 bool PrefValueStore::PrefHasChanged(const char* path,
                                     PrefNotifier::PrefStoreType new_store) {
   DCHECK(new_store != PrefNotifier::INVALID_STORE);
   // Replying that the pref has changed may cause problems, but it's the safer
   // choice.
   if (new_store == PrefNotifier::INVALID_STORE)
     return true;
 
   PrefNotifier::PrefStoreType controller = ControllingPrefStoreForPref(path);
-  DCHECK(controller != PrefNotifier::INVALID_STORE);
+  DCHECK(controller != PrefNotifier::INVALID_STORE)
+      << "Invalid controller for path " << path;
   if (controller == PrefNotifier::INVALID_STORE)
     return true;
 
   // If the pref is controlled by a higher-priority store, its effective value
   // cannot have changed.
   if (controller < new_store)
     return false;
 
   // Otherwise, we take the pref store's word that something changed.
   return true;
@@ skipping 287 matching lines @@
     if ((PrefValueInManagedPlatformStore(*i) ||
          PrefValueInDeviceManagementStore(*i)) &&
         PrefValueInStoreRange(*i,
                               PrefNotifier::COMMAND_LINE_STORE,
                               PrefNotifier::USER_STORE))
       return true;
   }
   return false;
 }
 
+void PrefValueStore::ReplaceExtensionPrefStore(PrefStore* extension_prefs) {
+    pref_stores_[PrefNotifier::EXTENSION_STORE].reset(extension_prefs);
+}
+
+PrefStore* PrefValueStore::GetExtensionPrefStore() {
+    return pref_stores_[PrefNotifier::EXTENSION_STORE].get();
+}
+
 PrefValueStore::PrefValueStore(PrefStore* managed_platform_prefs,
                                PrefStore* device_management_prefs,
                                PrefStore* extension_prefs,
                                PrefStore* command_line_prefs,
                                PrefStore* user_prefs,
                                PrefStore* recommended_prefs,
                                PrefStore* default_prefs) {
   // NULL default pref store is usually bad, but may be OK for some unit tests.
   if (!default_prefs)
     LOG(WARNING) << "default pref store is null";
   pref_stores_[PrefNotifier::MANAGED_PLATFORM_STORE].reset(
       managed_platform_prefs);
   pref_stores_[PrefNotifier::DEVICE_MANAGEMENT_STORE].reset(
       device_management_prefs);
   pref_stores_[PrefNotifier::EXTENSION_STORE].reset(extension_prefs);
   pref_stores_[PrefNotifier::COMMAND_LINE_STORE].reset(command_line_prefs);
   pref_stores_[PrefNotifier::USER_STORE].reset(user_prefs);
   pref_stores_[PrefNotifier::RECOMMENDED_STORE].reset(recommended_prefs);
   pref_stores_[PrefNotifier::DEFAULT_STORE].reset(default_prefs);
 }