diff options
| author | vkuzkokov <vkuzkokov@chromium.org> | 2014-12-12 06:52:15 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-12-12 14:52:40 +0000 |
| commit | 8444156d64786c635aa6b67223c6c311851aa4c5 (patch) | |
| tree | f69ea7ea36d80a933a0df7b81bd9d53d13d58ac9 /content/browser/devtools/devtools_manager_unittest.cc | |
| parent | a6e7009ffc0af9413eb8dffb6100e90b369978e7 (diff) | |
| download | chromium_src-8444156d64786c635aa6b67223c6c311851aa4c5.zip chromium_src-8444156d64786c635aa6b67223c6c311851aa4c5.tar.gz chromium_src-8444156d64786c635aa6b67223c6c311851aa4c5.tar.bz2 | |
[DevTools] Fix DevToolsManagerTest.TestObserver
BUG=440120
Review URL: https://codereview.chromium.org/790723003
Cr-Commit-Position: refs/heads/master@{#308084}
Diffstat (limited to 'content/browser/devtools/devtools_manager_unittest.cc')
| -rw-r--r-- | content/browser/devtools/devtools_manager_unittest.cc | 5 |
1 files changed, 3 insertions, 2 deletions
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 |