Don't instantiate an ExtensionPrefStore....

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"
@@ skipping 76 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) {
   PrefStore* managed_prefs = NULL;
-  ExtensionPrefStore* extension_prefs = new ExtensionPrefStore(NULL);
+  // TODO(pamg): Reinstate extension pref store after Mstone6 branch, when its
+  // memory leaks are fixed and any extension API is using it.
+  // ExtensionPrefStore* extension_prefs = new ExtensionPrefStore(NULL);
+  ExtensionPrefStore* extension_prefs = NULL;
   CommandLinePrefStore* command_line_prefs = new CommandLinePrefStore(
       CommandLine::ForCurrentProcess());
   PrefStore* local_prefs = new JsonPrefStore(
       pref_filename,
       ChromeThread::GetMessageLoopProxyForThread(ChromeThread::FILE));
   PrefStore* recommended_prefs = NULL;
 
   ConfigurationPolicyProvider* managed_prefs_provider = NULL;
   ConfigurationPolicyProvider* recommended_prefs_provider = NULL;
 
@@ skipping 27 matching lines @@
 
   // The PrefValueStore takes ownership of the PrefStores.
   PrefValueStore* value_store = new PrefValueStore(
       managed_prefs,
       extension_prefs,
       command_line_prefs,
       local_prefs,
       recommended_prefs);
 
   PrefService* pref_service = new PrefService(value_store);
-  extension_prefs->SetPrefService(pref_service);
+  // TODO(pamg): Uncomment when ExtensionPrefStore is reinstated.
+  // extension_prefs->SetPrefService(pref_service);
 
   return pref_service;
 }
 
 // static
 PrefService* PrefService::CreateUserPrefService(
     const FilePath& pref_filename) {
   PrefValueStore* value_store = new PrefValueStore(
       NULL, /* no enforced prefs */
       NULL, /* no extension prefs */
@@ skipping 697 matching lines @@
   return pref_value_store_->PrefValueInUserStore(name_.c_str());
 }
 
 bool PrefService::Preference::IsExtensionControlled() const {
   return pref_value_store_->PrefValueFromExtensionStore(name_.c_str());
 }
 
 bool PrefService::Preference::IsUserControlled() const {
   return pref_value_store_->PrefValueFromUserStore(name_.c_str());
 }