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

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

Issue 5915004: Introduce incognito preference settings. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed whitespaces in mac files Created 9 years, 11 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
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 992dd2c35bea6c71076bf576585ad057845bbf2f..a0b5614792446152061e6a57ae5810310f99e079 100644
--- a/chrome/browser/ui/cocoa/extensions/extension_popup_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/extensions/extension_popup_controller_unittest.mm
@@ -1,10 +1,10 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// 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/message_loop.h"
#include "base/scoped_nsobject.h"
-#include "chrome/browser/extensions/extension_pref_store.h"
+#include "chrome/browser/extensions/extension_pref_value_map.h"
#include "chrome/browser/extensions/extension_prefs.h"
#include "chrome/browser/extensions/extension_process_manager.h"
#include "chrome/browser/extensions/extension_service.h"
@@ -28,10 +28,10 @@ class ExtensionTestingProfile : public TestingProfile {
DCHECK(!GetExtensionService());
manager_.reset(ExtensionProcessManager::Create(this));
- ExtensionPrefStore* pref_store = new ExtensionPrefStore;
+ extension_pref_value_map_.reset(new ExtensionPrefValueMap);
extension_prefs_.reset(new ExtensionPrefs(GetPrefs(),
GetExtensionsInstallDir(),
- pref_store));
+ extension_pref_value_map_.get()));
service_ = new ExtensionService(this,
CommandLine::ForCurrentProcess(),
GetExtensionsInstallDir(),
@@ -61,6 +61,7 @@ class ExtensionTestingProfile : public TestingProfile {
scoped_ptr<ExtensionProcessManager> manager_;
scoped_ptr<ExtensionPrefs> extension_prefs_;
scoped_refptr<ExtensionService> service_;
+ scoped_ptr<ExtensionPrefValueMap> extension_pref_value_map_;
DISALLOW_COPY_AND_ASSIGN(ExtensionTestingProfile);
};

Powered by Google App Engine
This is Rietveld 408576698