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

Side by Side Diff: chrome/browser/extensions/test_extension_system.cc

Issue 1066993002: Make DeclarativeUserScriptManager non-shared between profiles. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Make DeclarativeUserScriptManager be a KeyedService. Created 5 years, 8 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "chrome/browser/extensions/test_extension_system.h" 5 #include "chrome/browser/extensions/test_extension_system.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/prefs/pref_service.h" 8 #include "base/prefs/pref_service.h"
9 #include "chrome/browser/extensions/blacklist.h" 9 #include "chrome/browser/extensions/blacklist.h"
10 #include "chrome/browser/extensions/error_console/error_console.h" 10 #include "chrome/browser/extensions/error_console/error_console.h"
11 #include "chrome/browser/extensions/extension_management.h" 11 #include "chrome/browser/extensions/extension_management.h"
12 #include "chrome/browser/extensions/extension_service.h" 12 #include "chrome/browser/extensions/extension_service.h"
13 #include "chrome/browser/extensions/install_verifier.h" 13 #include "chrome/browser/extensions/install_verifier.h"
14 #include "chrome/browser/extensions/shared_module_service.h" 14 #include "chrome/browser/extensions/shared_module_service.h"
15 #include "chrome/browser/profiles/profile.h" 15 #include "chrome/browser/profiles/profile.h"
16 #include "chrome/common/chrome_switches.h" 16 #include "chrome/common/chrome_switches.h"
17 #include "content/public/browser/browser_thread.h" 17 #include "content/public/browser/browser_thread.h"
18 #include "extensions/browser/declarative_user_script_manager.h"
19 #include "extensions/browser/event_router.h" 18 #include "extensions/browser/event_router.h"
20 #include "extensions/browser/extension_pref_value_map.h" 19 #include "extensions/browser/extension_pref_value_map.h"
21 #include "extensions/browser/extension_pref_value_map_factory.h" 20 #include "extensions/browser/extension_pref_value_map_factory.h"
22 #include "extensions/browser/extension_prefs.h" 21 #include "extensions/browser/extension_prefs.h"
23 #include "extensions/browser/extension_prefs_factory.h" 22 #include "extensions/browser/extension_prefs_factory.h"
24 #include "extensions/browser/extension_registry.h" 23 #include "extensions/browser/extension_registry.h"
25 #include "extensions/browser/extension_system.h" 24 #include "extensions/browser/extension_system.h"
26 #include "extensions/browser/extensions_browser_client.h" 25 #include "extensions/browser/extensions_browser_client.h"
27 #include "extensions/browser/info_map.h" 26 #include "extensions/browser/info_map.h"
28 #include "extensions/browser/lazy_background_task_queue.h" 27 #include "extensions/browser/lazy_background_task_queue.h"
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
85 bool autoupdate_enabled) { 84 bool autoupdate_enabled) {
86 if (!ExtensionPrefs::Get(profile_)) 85 if (!ExtensionPrefs::Get(profile_))
87 CreateExtensionPrefs(command_line, install_directory); 86 CreateExtensionPrefs(command_line, install_directory);
88 install_verifier_.reset( 87 install_verifier_.reset(
89 new InstallVerifier(ExtensionPrefs::Get(profile_), profile_)); 88 new InstallVerifier(ExtensionPrefs::Get(profile_), profile_));
90 // The ownership of |value_store_| is immediately transferred to state_store_, 89 // The ownership of |value_store_| is immediately transferred to state_store_,
91 // but we keep a naked pointer to the TestingValueStore. 90 // but we keep a naked pointer to the TestingValueStore.
92 scoped_ptr<TestingValueStore> value_store(new TestingValueStore()); 91 scoped_ptr<TestingValueStore> value_store(new TestingValueStore());
93 value_store_ = value_store.get(); 92 value_store_ = value_store.get();
94 state_store_.reset(new StateStore(profile_, value_store.Pass())); 93 state_store_.reset(new StateStore(profile_, value_store.Pass()));
95 declarative_user_script_manager_.reset(
96 new DeclarativeUserScriptManager(profile_));
97 management_policy_.reset(new ManagementPolicy()); 94 management_policy_.reset(new ManagementPolicy());
98 management_policy_->RegisterProviders( 95 management_policy_->RegisterProviders(
99 ExtensionManagementFactory::GetForBrowserContext(profile_) 96 ExtensionManagementFactory::GetForBrowserContext(profile_)
100 ->GetProviders()); 97 ->GetProviders());
101 runtime_data_.reset(new RuntimeData(ExtensionRegistry::Get(profile_))); 98 runtime_data_.reset(new RuntimeData(ExtensionRegistry::Get(profile_)));
102 extension_service_.reset(new ExtensionService(profile_, 99 extension_service_.reset(new ExtensionService(profile_,
103 command_line, 100 command_line,
104 install_directory, 101 install_directory,
105 ExtensionPrefs::Get(profile_), 102 ExtensionPrefs::Get(profile_),
106 Blacklist::Get(profile_), 103 Blacklist::Get(profile_),
(...skipping 17 matching lines...) Expand all
124 } 121 }
125 122
126 void TestExtensionSystem::SetExtensionService(ExtensionService* service) { 123 void TestExtensionSystem::SetExtensionService(ExtensionService* service) {
127 extension_service_.reset(service); 124 extension_service_.reset(service);
128 } 125 }
129 126
130 SharedUserScriptMaster* TestExtensionSystem::shared_user_script_master() { 127 SharedUserScriptMaster* TestExtensionSystem::shared_user_script_master() {
131 return NULL; 128 return NULL;
132 } 129 }
133 130
134 DeclarativeUserScriptManager*
135 TestExtensionSystem::declarative_user_script_manager() {
136 return declarative_user_script_manager_.get();
137 }
138
139 StateStore* TestExtensionSystem::state_store() { 131 StateStore* TestExtensionSystem::state_store() {
140 return state_store_.get(); 132 return state_store_.get();
141 } 133 }
142 134
143 StateStore* TestExtensionSystem::rules_store() { 135 StateStore* TestExtensionSystem::rules_store() {
144 return state_store_.get(); 136 return state_store_.get();
145 } 137 }
146 138
147 InfoMap* TestExtensionSystem::info_map() { return info_map_.get(); } 139 InfoMap* TestExtensionSystem::info_map() { return info_map_.get(); }
148 140
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
182 return extension_service()->shared_module_service()->GetDependentExtensions( 174 return extension_service()->shared_module_service()->GetDependentExtensions(
183 extension); 175 extension);
184 } 176 }
185 177
186 // static 178 // static
187 KeyedService* TestExtensionSystem::Build(content::BrowserContext* profile) { 179 KeyedService* TestExtensionSystem::Build(content::BrowserContext* profile) {
188 return new TestExtensionSystem(static_cast<Profile*>(profile)); 180 return new TestExtensionSystem(static_cast<Profile*>(profile));
189 } 181 }
190 182
191 } // namespace extensions 183 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/browser/extensions/test_extension_system.h ('k') | extensions/browser/browser_context_keyed_service_factories.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698