OLD | NEW |
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" |
(...skipping 16 matching lines...) Expand all Loading... |
27 #include "content/public/browser/browser_thread.h" | 27 #include "content/public/browser/browser_thread.h" |
28 | 28 |
29 using content::BrowserThread; | 29 using content::BrowserThread; |
30 | 30 |
31 namespace extensions { | 31 namespace extensions { |
32 | 32 |
33 TestExtensionSystem::TestExtensionSystem(Profile* profile) | 33 TestExtensionSystem::TestExtensionSystem(Profile* profile) |
34 : profile_(profile), | 34 : profile_(profile), |
35 value_store_(NULL), | 35 value_store_(NULL), |
36 info_map_(new ExtensionInfoMap()), | 36 info_map_(new ExtensionInfoMap()), |
37 error_console_(new ErrorConsole(profile)) { | 37 error_console_(new ErrorConsole(profile, NULL)) { |
38 } | 38 } |
39 | 39 |
40 TestExtensionSystem::~TestExtensionSystem() { | 40 TestExtensionSystem::~TestExtensionSystem() { |
41 } | 41 } |
42 | 42 |
43 void TestExtensionSystem::Shutdown() { | 43 void TestExtensionSystem::Shutdown() { |
44 extension_process_manager_.reset(); | 44 extension_process_manager_.reset(); |
45 } | 45 } |
46 | 46 |
47 void TestExtensionSystem::CreateExtensionProcessManager() { | 47 void TestExtensionSystem::CreateExtensionProcessManager() { |
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
155 return error_console_.get(); | 155 return error_console_.get(); |
156 } | 156 } |
157 | 157 |
158 // static | 158 // static |
159 BrowserContextKeyedService* TestExtensionSystem::Build( | 159 BrowserContextKeyedService* TestExtensionSystem::Build( |
160 content::BrowserContext* profile) { | 160 content::BrowserContext* profile) { |
161 return new TestExtensionSystem(static_cast<Profile*>(profile)); | 161 return new TestExtensionSystem(static_cast<Profile*>(profile)); |
162 } | 162 } |
163 | 163 |
164 } // namespace extensions | 164 } // namespace extensions |
OLD | NEW |