Index: chrome/test/testing_browser_process.cc |
diff --git a/chrome/test/testing_browser_process.cc b/chrome/test/testing_browser_process.cc |
index f194a0b1bc389a93f9e3ab193d60f7cbdc6376e8..244a3ff39a20dee6c3faccb66a101320b9ccc1ea 100644 |
--- a/chrome/test/testing_browser_process.cc |
+++ b/chrome/test/testing_browser_process.cc |
@@ -12,6 +12,7 @@ |
#include "chrome/browser/prerender/prerender_tracker.h" |
#include "chrome/browser/printing/background_printing_manager.h" |
#include "chrome/browser/profiles/profile_manager.h" |
+#include "content/browser/debugger/devtools_manager.h" |
#include "net/url_request/url_request_context_getter.h" |
#include "ui/base/clipboard/clipboard.h" |
#include "testing/gtest/include/gtest/gtest.h" |
@@ -20,7 +21,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 +98,7 @@ ThumbnailGenerator* TestingBrowserProcess::GetThumbnailGenerator() { |
} |
DevToolsManager* TestingBrowserProcess::devtools_manager() { |
- return NULL; |
+ return devtools_manager_.get(); |
} |
SidebarManager* TestingBrowserProcess::sidebar_manager() { |
@@ -262,6 +264,10 @@ void TestingBrowserProcess::SetIOThread(IOThread* io_thread) { |
io_thread_ = io_thread; |
} |
+void TestingBrowserProcess::SetDevToolsManager(DevToolsManager* manager) { |
+ devtools_manager_.reset(manager); |
+} |
+ |
ScopedTestingBrowserProcess::ScopedTestingBrowserProcess() { |
// TODO(phajdan.jr): Temporary, for http://crbug.com/61062. |
// ChromeTestSuite sets up a global TestingBrowserProcess |