| Index: chrome/test/testing_browser_process.cc
|
| diff --git a/chrome/test/testing_browser_process.cc b/chrome/test/testing_browser_process.cc
|
| index 115de3ef90680100334402b129edf2c1422fa2ae..16c5fea2d8584406636bb84e034e7552ae15c8fd 100644
|
| --- a/chrome/test/testing_browser_process.cc
|
| +++ b/chrome/test/testing_browser_process.cc
|
| @@ -20,7 +20,8 @@ TestingBrowserProcess::TestingBrowserProcess()
|
| : module_ref_count_(0),
|
| app_locale_("en"),
|
| local_state_(NULL),
|
| - io_thread_(NULL) {
|
| + io_thread_(NULL),
|
| + devtools_manager_(NULL) {
|
| }
|
|
|
| TestingBrowserProcess::~TestingBrowserProcess() {
|
| @@ -96,7 +97,7 @@ ThumbnailGenerator* TestingBrowserProcess::GetThumbnailGenerator() {
|
| }
|
|
|
| DevToolsManager* TestingBrowserProcess::devtools_manager() {
|
| - return NULL;
|
| + return devtools_manager_;
|
| }
|
|
|
| SidebarManager* TestingBrowserProcess::sidebar_manager() {
|
| @@ -258,6 +259,10 @@ void TestingBrowserProcess::SetIOThread(IOThread* io_thread) {
|
| io_thread_ = io_thread;
|
| }
|
|
|
| +void TestingBrowserProcess::SetDevToolsManager(DevToolsManager* manager) {
|
| + devtools_manager_ = manager;
|
| +}
|
| +
|
| ScopedTestingBrowserProcess::ScopedTestingBrowserProcess() {
|
| // TODO(phajdan.jr): Temporary, for http://crbug.com/61062.
|
| // ChromeTestSuite sets up a global TestingBrowserProcess
|
|
|