Make ExtensionPrefValueMap a ProfileKeyedService.

chrome/browser/ui/cocoa/extensions/extension_popup_controller_unittest.mm

 // Copyright (c) 2011 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/memory/scoped_nsobject.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.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_prefs.h"
 #include "chrome/browser/extensions/extension_process_manager.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/cocoa/cocoa_test_helper.h"
 #include "chrome/browser/ui/cocoa/extensions/extension_popup_controller.h"
 #include "chrome/test/base/testing_profile.h"
 
 namespace {
 
 class ExtensionTestingProfile : public TestingProfile {
  public:
   ExtensionTestingProfile() {}
 
   FilePath GetExtensionsInstallDir() {
     return GetPath().AppendASCII(ExtensionService::kInstallDirectoryName);
   }
 
   void InitExtensionProfile() {
     DCHECK(!GetExtensionProcessManager());
     DCHECK(!GetExtensionService());
 
     manager_.reset(ExtensionProcessManager::Create(this));
-    extension_pref_value_map_.reset(new ExtensionPrefValueMap);
-    extension_prefs_.reset(new ExtensionPrefs(GetPrefs(),
-                                              GetExtensionsInstallDir(),
-                                              extension_pref_value_map_.get()));
+    extension_prefs_.reset(new ExtensionPrefs(
+        GetPrefs(),
+        GetExtensionsInstallDir(),
+        ExtensionPrefValueMapFactory::GetForProfile(this)));
     extension_prefs_->Init(false);
     service_.reset(new ExtensionService(this,
                                         CommandLine::ForCurrentProcess(),
                                         GetExtensionsInstallDir(),
                                         extension_prefs_.get(),
                                         false,
                                         true));
     service_->set_extensions_enabled(true);
     service_->set_show_extensions_prompts(false);
     service_->ClearProvidersForTesting();
@@ skipping 11 matching lines @@
   }
 
   virtual ExtensionService* GetExtensionService() {
     return service_.get();
   }
 
  private:
   scoped_ptr<ExtensionProcessManager> manager_;
   scoped_ptr<ExtensionPrefs> extension_prefs_;
   scoped_ptr<ExtensionService> service_;
-  scoped_ptr<ExtensionPrefValueMap> extension_pref_value_map_;
 
   DISALLOW_COPY_AND_ASSIGN(ExtensionTestingProfile);
 };
 
 class ExtensionPopupControllerTest : public CocoaTest {
  public:
   virtual void SetUp() {
     CocoaTest::SetUp();
     profile_.reset(new ExtensionTestingProfile());
     profile_->InitExtensionProfile();
@@ skipping 16 matching lines @@
 };
 
 TEST_F(ExtensionPopupControllerTest, DISABLED_Basics) {
   // TODO(andybons): Better mechanisms for mocking out the extensions service
   // and extensions for easy testing need to be implemented.
   // http://crbug.com/28316
   EXPECT_TRUE([ExtensionPopupController popup]);
 }
 
 }  // namespace