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

Unified Diff: chrome/browser/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: Temporary hack to fix regression in unit tests Created 10 years, 1 month 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
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..56df3bd15176ecf002852b3f00db78ef6da0523a 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));
+ ExtensionPrefs* extension_prefs = new ExtensionPrefs(
+ GetPrefs(),
+ GetExtensionsInstallDir());
service_ = new ExtensionsService(this,
CommandLine::ForCurrentProcess(),
- GetExtensionsInstallDir(),
+ GetExtensionsInstallDir(),
+ extension_prefs,
false);
service_->set_extensions_enabled(true);
service_->set_show_extensions_prompts(false);

Powered by Google App Engine
This is Rietveld 408576698