From 8444156d64786c635aa6b67223c6c311851aa4c5 Mon Sep 17 00:00:00 2001
From: vkuzkokov <vkuzkokov@chromium.org>
Date: Fri, 12 Dec 2014 06:52:15 -0800
Subject: [DevTools] Fix DevToolsManagerTest.TestObserver

BUG=440120

Review URL: https://codereview.chromium.org/790723003

Cr-Commit-Position: refs/heads/master@{#308084}
---
 content/browser/devtools/devtools_manager_unittest.cc | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to '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 988ffb7..9eb47d7 100644
--- a/content/browser/devtools/devtools_manager_unittest.cc
+++ b/content/browser/devtools/devtools_manager_unittest.cc
@@ -206,10 +206,12 @@ class DevToolsManagerTest : public RenderViewHostImplTestHarness {
     RenderViewHostImplTestHarness::SetUp();
     TestDevToolsClientHost::ResetCounters();
     old_browser_client_ = SetBrowserClientForTesting(&browser_client_);
+    DevToolsManager::GetInstance()->SetUpForTest(DevToolsManager::Scheduler());
   }
 
   void TearDown() override {
     SetBrowserClientForTesting(old_browser_client_);
+    DevToolsManager::GetInstance()->SetUpForTest(DevToolsManager::Scheduler());
     RenderViewHostImplTestHarness::TearDown();
   }
 
@@ -385,7 +387,7 @@ TEST_F(DevToolsManagerTest, TestObserver) {
 
   TestDevToolsManagerScheduler scheduler;
   DevToolsManager* manager = DevToolsManager::GetInstance();
-  manager->SetSchedulerForTest(scheduler.callback());
+  manager->SetUpForTest(scheduler.callback());
 
   contents()->NavigateAndCommit(url1);
   RunAllPendingInMessageLoop();
@@ -454,7 +456,6 @@ TEST_F(DevToolsManagerTest, TestObserver) {
   manager->RemoveObserver(observer.get());
 
   EXPECT_TRUE(scheduler.IsEmpty());
-  manager->SetSchedulerForTest(DevToolsManager::Scheduler());
 }
 
 }  // namespace content
-- 
cgit v1.1