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

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

Issue 7977018: Enable sync for the settings from the Extension Settings API. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix race condition in ExtensionSettingsUIWrapper::Core Created 9 years, 3 months 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/sync/util/cryptographer.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 88363dc7bc62bd9d29e889d0d96ced4513c2adb1..499c1a96d91617320918eaea8e45001047c67fa9 100644
--- a/chrome/browser/ui/cocoa/extensions/extension_popup_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/extensions/extension_popup_controller_unittest.mm
@@ -9,7 +9,6 @@
#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/extensions/extension_settings.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"
@@ -38,12 +37,10 @@ class ExtensionTestingProfile : public TestingProfile {
extension_prefs_.reset(new ExtensionPrefs(GetPrefs(),
GetExtensionsInstallDir(),
extension_pref_value_map_.get()));
- extension_settings_ = new ExtensionSettings(GetExtensionsSettingsDir());
service_.reset(new ExtensionService(this,
CommandLine::ForCurrentProcess(),
GetExtensionsInstallDir(),
extension_prefs_.get(),
- extension_settings_.get(),
false,
true));
service_->set_extensions_enabled(true);
@@ -56,7 +53,6 @@ class ExtensionTestingProfile : public TestingProfile {
manager_.reset();
service_.reset();
extension_prefs_.reset();
- extension_settings_ = NULL;
}
virtual ExtensionProcessManager* GetExtensionProcessManager() {
@@ -70,7 +66,6 @@ class ExtensionTestingProfile : public TestingProfile {
private:
scoped_ptr<ExtensionProcessManager> manager_;
scoped_ptr<ExtensionPrefs> extension_prefs_;
- scoped_refptr<ExtensionSettings> extension_settings_;
scoped_ptr<ExtensionService> service_;
scoped_ptr<ExtensionPrefValueMap> extension_pref_value_map_;
« no previous file with comments | « chrome/browser/sync/util/cryptographer.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698