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

Side by Side Diff: chrome/browser/ui/cocoa/extensions/extension_popup_controller_unittest.mm

Issue 8060017: Ensure that --disable-extensions disables extension prefs from being enacted (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Split ExtensionPrefs constructor into constructor and Init function Created 9 years, 2 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/browser/profiles/profile_impl.cc ('k') | chrome/test/base/testing_profile.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/memory/scoped_nsobject.h" 5 #include "base/memory/scoped_nsobject.h"
6 #include "base/memory/scoped_ptr.h" 6 #include "base/memory/scoped_ptr.h"
7 #include "base/message_loop.h" 7 #include "base/message_loop.h"
8 #include "chrome/browser/extensions/extension_pref_value_map.h" 8 #include "chrome/browser/extensions/extension_pref_value_map.h"
9 #include "chrome/browser/extensions/extension_prefs.h" 9 #include "chrome/browser/extensions/extension_prefs.h"
10 #include "chrome/browser/extensions/extension_process_manager.h" 10 #include "chrome/browser/extensions/extension_process_manager.h"
(...skipping 19 matching lines...) Expand all
30 30
31 void InitExtensionProfile() { 31 void InitExtensionProfile() {
32 DCHECK(!GetExtensionProcessManager()); 32 DCHECK(!GetExtensionProcessManager());
33 DCHECK(!GetExtensionService()); 33 DCHECK(!GetExtensionService());
34 34
35 manager_.reset(ExtensionProcessManager::Create(this)); 35 manager_.reset(ExtensionProcessManager::Create(this));
36 extension_pref_value_map_.reset(new ExtensionPrefValueMap); 36 extension_pref_value_map_.reset(new ExtensionPrefValueMap);
37 extension_prefs_.reset(new ExtensionPrefs(GetPrefs(), 37 extension_prefs_.reset(new ExtensionPrefs(GetPrefs(),
38 GetExtensionsInstallDir(), 38 GetExtensionsInstallDir(),
39 extension_pref_value_map_.get())); 39 extension_pref_value_map_.get()));
40 extension_prefs_->Init(false);
40 service_.reset(new ExtensionService(this, 41 service_.reset(new ExtensionService(this,
41 CommandLine::ForCurrentProcess(), 42 CommandLine::ForCurrentProcess(),
42 GetExtensionsInstallDir(), 43 GetExtensionsInstallDir(),
43 extension_prefs_.get(), 44 extension_prefs_.get(),
44 false, 45 false,
45 true)); 46 true));
46 service_->set_extensions_enabled(true); 47 service_->set_extensions_enabled(true);
47 service_->set_show_extensions_prompts(false); 48 service_->set_show_extensions_prompts(false);
48 service_->ClearProvidersForTesting(); 49 service_->ClearProvidersForTesting();
49 service_->Init(); 50 service_->Init();
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
97 }; 98 };
98 99
99 TEST_F(ExtensionPopupControllerTest, DISABLED_Basics) { 100 TEST_F(ExtensionPopupControllerTest, DISABLED_Basics) {
100 // TODO(andybons): Better mechanisms for mocking out the extensions service 101 // TODO(andybons): Better mechanisms for mocking out the extensions service
101 // and extensions for easy testing need to be implemented. 102 // and extensions for easy testing need to be implemented.
102 // http://crbug.com/28316 103 // http://crbug.com/28316
103 EXPECT_TRUE([ExtensionPopupController popup]); 104 EXPECT_TRUE([ExtensionPopupController popup]);
104 } 105 }
105 106
106 } // namespace 107 } // namespace
OLDNEW
« no previous file with comments | « chrome/browser/profiles/profile_impl.cc ('k') | chrome/test/base/testing_profile.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698