[DevTools] Fix DevToolsManagerTest.TestObserver

content/browser/devtools/devtools_manager_unittest.cc

Index: content/browser/devtools/devtools_manager_unittest.cc
diff --git a/content/browser/devtools/devtools_manager_unittest.cc b/content/browser/devtools/devtools_manager_unittest.cc
index 988ffb752fb2e01dcbbeefed6ea7eb3c0ae94e2e..d7e52f65f6608f106a9750a472f964068e7fa5f0 100644
--- a/content/browser/devtools/devtools_manager_unittest.cc
+++ b/content/browser/devtools/devtools_manager_unittest.cc
@@ -210,6 +210,7 @@ class DevToolsManagerTest : public RenderViewHostImplTestHarness {
 
   void TearDown() override {
     SetBrowserClientForTesting(old_browser_client_);
+    DevToolsManager::GetInstance()->SetUpForTest(DevToolsManager::Scheduler());
     RenderViewHostImplTestHarness::TearDown();
   }
 
@@ -385,7 +386,7 @@ TEST_F(DevToolsManagerTest, TestObserver) {
 
   TestDevToolsManagerScheduler scheduler;
   DevToolsManager* manager = DevToolsManager::GetInstance();
-  manager->SetSchedulerForTest(scheduler.callback());
+  manager->SetUpForTest(scheduler.callback());

[dgozman, 2014/12/12 12:51:08]

Move this to SetUp.

[vkuzkokov, 2014/12/12 12:59:12]

Added to SetUp. Call here is left because we don't have |scheduler| in SetUp.

 
   contents()->NavigateAndCommit(url1);
   RunAllPendingInMessageLoop();
@@ -454,7 +455,6 @@ TEST_F(DevToolsManagerTest, TestObserver) {
   manager->RemoveObserver(observer.get());
 
   EXPECT_TRUE(scheduler.IsEmpty());
-  manager->SetSchedulerForTest(DevToolsManager::Scheduler());
 }
 
 }  // namespace content