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

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

Issue 1139643005: Extract ErrorConsole from ExtensionSystem. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: use ErrorConsole::Get, update year for copyright lines Created 5 years, 7 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"
11 #include "chrome/browser/extensions/extension_management.h" 10 #include "chrome/browser/extensions/extension_management.h"
12 #include "chrome/browser/extensions/extension_service.h" 11 #include "chrome/browser/extensions/extension_service.h"
13 #include "chrome/browser/extensions/install_verifier.h" 12 #include "chrome/browser/extensions/install_verifier.h"
14 #include "chrome/browser/extensions/shared_module_service.h" 13 #include "chrome/browser/extensions/shared_module_service.h"
15 #include "chrome/browser/profiles/profile.h" 14 #include "chrome/browser/profiles/profile.h"
16 #include "chrome/common/chrome_switches.h" 15 #include "chrome/common/chrome_switches.h"
17 #include "content/public/browser/browser_thread.h" 16 #include "content/public/browser/browser_thread.h"
18 #include "extensions/browser/declarative_user_script_manager.h" 17 #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"
(...skipping 12 matching lines...) Expand all
33 #include "extensions/browser/value_store/testing_value_store.h" 32 #include "extensions/browser/value_store/testing_value_store.h"
34 33
35 using content::BrowserThread; 34 using content::BrowserThread;
36 35
37 namespace extensions { 36 namespace extensions {
38 37
39 TestExtensionSystem::TestExtensionSystem(Profile* profile) 38 TestExtensionSystem::TestExtensionSystem(Profile* profile)
40 : profile_(profile), 39 : profile_(profile),
41 value_store_(NULL), 40 value_store_(NULL),
42 info_map_(new InfoMap()), 41 info_map_(new InfoMap()),
43 error_console_(new ErrorConsole(profile)),
44 quota_service_(new QuotaService()) {} 42 quota_service_(new QuotaService()) {}
45 43
46 TestExtensionSystem::~TestExtensionSystem() { 44 TestExtensionSystem::~TestExtensionSystem() {
47 } 45 }
48 46
49 void TestExtensionSystem::Shutdown() { 47 void TestExtensionSystem::Shutdown() {
50 if (extension_service_) 48 if (extension_service_)
51 extension_service_->Shutdown(); 49 extension_service_->Shutdown();
52 } 50 }
53 51
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
150 TestExtensionSystem::lazy_background_task_queue() { 148 TestExtensionSystem::lazy_background_task_queue() {
151 return lazy_background_task_queue_.get(); 149 return lazy_background_task_queue_.get();
152 } 150 }
153 151
154 void TestExtensionSystem::SetEventRouter(scoped_ptr<EventRouter> event_router) { 152 void TestExtensionSystem::SetEventRouter(scoped_ptr<EventRouter> event_router) {
155 event_router_.reset(event_router.release()); 153 event_router_.reset(event_router.release());
156 } 154 }
157 155
158 EventRouter* TestExtensionSystem::event_router() { return event_router_.get(); } 156 EventRouter* TestExtensionSystem::event_router() { return event_router_.get(); }
159 157
160 ErrorConsole* TestExtensionSystem::error_console() {
161 return error_console_.get();
162 }
163
164 InstallVerifier* TestExtensionSystem::install_verifier() { 158 InstallVerifier* TestExtensionSystem::install_verifier() {
165 return install_verifier_.get(); 159 return install_verifier_.get();
166 } 160 }
167 161
168 QuotaService* TestExtensionSystem::quota_service() { 162 QuotaService* TestExtensionSystem::quota_service() {
169 return quota_service_.get(); 163 return quota_service_.get();
170 } 164 }
171 165
172 const OneShotEvent& TestExtensionSystem::ready() const { 166 const OneShotEvent& TestExtensionSystem::ready() const {
173 return ready_; 167 return ready_;
174 } 168 }
175 169
176 ContentVerifier* TestExtensionSystem::content_verifier() { 170 ContentVerifier* TestExtensionSystem::content_verifier() {
177 return NULL; 171 return NULL;
178 } 172 }
179 173
180 scoped_ptr<ExtensionSet> TestExtensionSystem::GetDependentExtensions( 174 scoped_ptr<ExtensionSet> TestExtensionSystem::GetDependentExtensions(
181 const Extension* extension) { 175 const Extension* extension) {
182 return extension_service()->shared_module_service()->GetDependentExtensions( 176 return extension_service()->shared_module_service()->GetDependentExtensions(
183 extension); 177 extension);
184 } 178 }
185 179
186 // static 180 // static
187 KeyedService* TestExtensionSystem::Build(content::BrowserContext* profile) { 181 KeyedService* TestExtensionSystem::Build(content::BrowserContext* profile) {
188 return new TestExtensionSystem(static_cast<Profile*>(profile)); 182 return new TestExtensionSystem(static_cast<Profile*>(profile));
189 } 183 }
190 184
191 } // namespace extensions 185 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/browser/extensions/test_extension_system.h ('k') | chrome/chrome_browser_extensions.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698