Make ExtensionPrefValueMap a ProfileKeyedService.

chrome/browser/profiles/profile_impl.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 "chrome/browser/profiles/profile_impl.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/environment.h"
@@ skipping 21 matching lines @@
 #include "chrome/browser/download/download_service.h"
 #include "chrome/browser/download/download_service_factory.h"
 #include "chrome/browser/extensions/component_loader.h"
 #include "chrome/browser/extensions/extension_devtools_manager.h"
 #include "chrome/browser/extensions/extension_error_reporter.h"
 #include "chrome/browser/extensions/extension_event_router.h"
 #include "chrome/browser/extensions/extension_info_map.h"
 #include "chrome/browser/extensions/extension_message_service.h"
 #include "chrome/browser/extensions/extension_navigation_observer.h"
 #include "chrome/browser/extensions/extension_pref_store.h"
+#include "chrome/browser/extensions/extension_pref_value_map.h"
+#include "chrome/browser/extensions/extension_pref_value_map_factory.h"
 #include "chrome/browser/extensions/extension_process_manager.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_special_storage_policy.h"
 #include "chrome/browser/extensions/lazy_background_task_queue.h"
 #include "chrome/browser/extensions/unpacked_installer.h"
 #include "chrome/browser/extensions/user_script_master.h"
 #include "chrome/browser/favicon/favicon_service.h"
 #include "chrome/browser/geolocation/chrome_geolocation_permission_context.h"
 #include "chrome/browser/history/history.h"
 #include "chrome/browser/history/shortcuts_backend.h"
@@ skipping 214 matching lines @@
   const CommandLine* command_line = CommandLine::ForCurrentProcess();
   predictor_ = chrome_browser_net::Predictor::CreatePredictor(
       !command_line->HasSwitch(switches::kDisablePreconnect),
       g_browser_process->profile_manager() == NULL);
 
   session_restore_enabled_ =
       !command_line->HasSwitch(switches::kDisableRestoreSessionState);
   if (create_mode == CREATE_MODE_ASYNCHRONOUS) {
     prefs_.reset(PrefService::CreatePrefService(
         GetPrefFilePath(),
-        new ExtensionPrefStore(GetExtensionPrefValueMap(), false),
+        new ExtensionPrefStore(
+            ExtensionPrefValueMapFactory::GetForProfile(this), false),
         true));
     // Wait for the notification that prefs has been loaded (successfully or
     // not).
     registrar_.Add(this, chrome::NOTIFICATION_PREF_INITIALIZATION_COMPLETED,
                    content::Source<PrefService>(prefs_.get()));
   } else if (create_mode == CREATE_MODE_SYNCHRONOUS) {
     // Load prefs synchronously.
     prefs_.reset(PrefService::CreatePrefService(
         GetPrefFilePath(),
-        new ExtensionPrefStore(GetExtensionPrefValueMap(), false),
+        new ExtensionPrefStore(
+            ExtensionPrefValueMapFactory::GetForProfile(this), false),
         false));
     OnPrefsLoaded(true);
   } else {
     NOTREACHED();
   }
 }
 
 void ProfileImpl::DoFinalInit(bool is_new_profile) {
   PrefService* prefs = GetPrefs();
   pref_change_registrar_.Init(prefs);
@@ skipping 372 matching lines @@
     content::NotificationService::current()->Notify(
         chrome::NOTIFICATION_PROFILE_CREATED,
         content::Source<Profile>(off_the_record_profile_.get()),
         content::NotificationService::NoDetails());
   }
   return off_the_record_profile_.get();
 }
 
 void ProfileImpl::DestroyOffTheRecordProfile() {
   off_the_record_profile_.reset();
-  extension_pref_value_map_->ClearAllIncognitoSessionOnlyPreferences();
+  ExtensionPrefValueMapFactory::GetForProfile(this)->
+      ClearAllIncognitoSessionOnlyPreferences();
 }
 
 bool ProfileImpl::HasOffTheRecordProfile() {
   return off_the_record_profile_.get() != NULL;
 }
 
 Profile* ProfileImpl::GetOriginalProfile() {
   return this;
 }
 
@@ skipping 74 matching lines @@
       prefs_->GetBoolean(prefs::kDisableExtensions) ||
       CommandLine::ForCurrentProcess()->HasSwitch(switches::kDisableExtensions);
 
   ProfileDependencyManager::GetInstance()->CreateProfileServices(this, false);
 
   // Ensure that preferences set by extensions are restored in the profile
   // as early as possible. The constructor takes care of that.
   extension_prefs_.reset(new ExtensionPrefs(
       prefs_.get(),
       GetPath().AppendASCII(ExtensionService::kInstallDirectoryName),
-      GetExtensionPrefValueMap()));
+      ExtensionPrefValueMapFactory::GetForProfile(this)));
   extension_prefs_->Init(extensions_disabled);
 
   DCHECK(!net_pref_observer_.get());
   net_pref_observer_.reset(new NetPrefObserver(
       prefs_.get(),
       prerender::PrerenderManagerFactory::GetForProfile(this),
       predictor_));
 
   bool is_new_profile = prefs_->GetInitializationStatus() ==
       PrefService::INITIALIZATION_STATUS_CREATED_NEW_PROFILE;
@@ skipping 10 matching lines @@
 PrefService* ProfileImpl::GetPrefs() {
   DCHECK(prefs_.get());  // Should explicitly be initialized.
   return prefs_.get();
 }
 
 PrefService* ProfileImpl::GetOffTheRecordPrefs() {
   if (!otr_prefs_.get()) {
     // The new ExtensionPrefStore is ref_counted and the new PrefService
     // stores a reference so that we do not leak memory here.
     otr_prefs_.reset(GetPrefs()->CreateIncognitoPrefService(
-        new ExtensionPrefStore(GetExtensionPrefValueMap(), true)));
+        new ExtensionPrefStore(
+            ExtensionPrefValueMapFactory::GetForProfile(this), true)));
   }
   return otr_prefs_.get();
 }
 
 FilePath ProfileImpl::GetPrefFilePath() {
   FilePath pref_file_path = path_;
   pref_file_path = pref_file_path.Append(chrome::kPreferencesFilename);
   return pref_file_path;
 }
 
@@ skipping 227 matching lines @@
     top_sites_ = new history::TopSites(this);
     top_sites_->Init(GetPath().Append(chrome::kTopSitesFilename));
   }
   return top_sites_;
 }
 
 history::TopSites* ProfileImpl::GetTopSitesWithoutCreating() {
   return top_sites_;
 }
 
-ExtensionPrefValueMap* ProfileImpl::GetExtensionPrefValueMap() {
-  if (!extension_pref_value_map_.get())
-    extension_pref_value_map_.reset(new ExtensionPrefValueMap);
-  return extension_pref_value_map_.get();
-}
-
 void ProfileImpl::MarkAsCleanShutdown() {
   if (prefs_.get()) {
     // The session cleanly exited, set kSessionExitedCleanly appropriately.
     prefs_->SetBoolean(prefs::kSessionExitedCleanly, true);
 
     // NOTE: If you change what thread this writes on, be sure and update
     // ChromeFrame::EndSession().
     prefs_->CommitPendingWrite();
   }
 }
@@ skipping 286 matching lines @@
                                      FilePath* cache_path,
                                      int* max_size) {
   DCHECK(cache_path);
   DCHECK(max_size);
   FilePath path(prefs_->GetFilePath(prefs::kDiskCacheDir));
   if (!path.empty())
     *cache_path = path;
   *max_size = is_media_context ? prefs_->GetInteger(prefs::kMediaCacheSize) :
                                  prefs_->GetInteger(prefs::kDiskCacheSize);
 }