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

chrome/browser/cocoa/extensions/extension_popup_controller_unittest.mm

Index: chrome/browser/cocoa/extensions/extension_popup_controller_unittest.mm
diff --git a/chrome/browser/cocoa/extensions/extension_popup_controller_unittest.mm b/chrome/browser/cocoa/extensions/extension_popup_controller_unittest.mm
index ba7e2b7f9df6ebd36f2c184fab9270de00534f94..5814e2c5a3b346e53e0f17e0e951da30fb561fc5 100644
--- a/chrome/browser/cocoa/extensions/extension_popup_controller_unittest.mm
+++ b/chrome/browser/cocoa/extensions/extension_popup_controller_unittest.mm
@@ -6,6 +6,7 @@
 #include "chrome/browser/cocoa/browser_test_helper.h"
 #include "chrome/browser/cocoa/cocoa_test_helper.h"
 #include "chrome/browser/cocoa/extensions/extension_popup_controller.h"
+#include "chrome/browser/extensions/extension_prefs.h"
 #include "chrome/browser/extensions/extension_process_manager.h"
 #include "chrome/browser/extensions/extensions_service.h"
 #include "chrome/test/testing_profile.h"
@@ -25,9 +26,13 @@ class ExtensionTestingProfile : public TestingProfile {
     DCHECK(!GetExtensionsService());
 
     manager_.reset(ExtensionProcessManager::Create(this));
+    extension_prefs_.reset(new ExtensionPrefs(this, 
+                                              GetPrefs(),
+                                              GetExtensionsInstallDir()));
     service_ = new ExtensionsService(this,
                                      CommandLine::ForCurrentProcess(),
-                                    GetExtensionsInstallDir(),
+                                     GetExtensionsInstallDir(),
+                                     extension_prefs_.get(),
                                      false);
     service_->set_extensions_enabled(true);
     service_->set_show_extensions_prompts(false);
@@ -38,6 +43,7 @@ class ExtensionTestingProfile : public TestingProfile {
   void ShutdownExtensionProfile() {
     manager_.reset();
     service_ = NULL;
+    extension_prefs_.reset();
   }
 
   virtual ExtensionProcessManager* GetExtensionProcessManager() {
@@ -50,6 +56,7 @@ class ExtensionTestingProfile : public TestingProfile {
 
  private:
   scoped_ptr<ExtensionProcessManager> manager_;
+  scoped_ptr<ExtensionPrefs> extension_prefs_;
   scoped_refptr<ExtensionsService> service_;
 
   DISALLOW_COPY_AND_ASSIGN(ExtensionTestingProfile);