Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(209)

Unified Diff: chrome/browser/ui/cocoa/extensions/extension_popup_controller_unittest.mm

Issue 5213002: Fix for Bug 50726 "Save extension list and "winning" prefs from extensions" (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Same patch but without stuff that is already included in 5204006 Created 10 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/profiles/profile_impl.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/cocoa/extensions/extension_popup_controller_unittest.mm
diff --git a/chrome/browser/ui/cocoa/extensions/extension_popup_controller_unittest.mm b/chrome/browser/ui/cocoa/extensions/extension_popup_controller_unittest.mm
index 0e74e5e1f5598c73147f0e45f9266f6010a8ca89..ac00647e12daed2f292374cd50f819b2a98d9f7f 100644
--- a/chrome/browser/ui/cocoa/extensions/extension_popup_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/extensions/extension_popup_controller_unittest.mm
@@ -3,6 +3,7 @@
// found in the LICENSE file.
#include "base/scoped_nsobject.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/browser/ui/cocoa/browser_test_helper.h"
@@ -25,9 +26,12 @@ class ExtensionTestingProfile : public TestingProfile {
DCHECK(!GetExtensionsService());
manager_.reset(ExtensionProcessManager::Create(this));
+ extension_prefs_.reset(new ExtensionPrefs(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 +42,7 @@ class ExtensionTestingProfile : public TestingProfile {
void ShutdownExtensionProfile() {
manager_.reset();
service_ = NULL;
+ extension_prefs_.reset();
}
virtual ExtensionProcessManager* GetExtensionProcessManager() {
@@ -50,6 +55,7 @@ class ExtensionTestingProfile : public TestingProfile {
private:
scoped_ptr<ExtensionProcessManager> manager_;
+ scoped_ptr<ExtensionPrefs> extension_prefs_;
scoped_refptr<ExtensionsService> service_;
DISALLOW_COPY_AND_ASSIGN(ExtensionTestingProfile);
« no previous file with comments | « chrome/browser/profiles/profile_impl.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698