Chromium Code Reviews Chromium Code Reviews
Issue 790723003:
[DevTools] Fix DevToolsManagerTest.TestObserver (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@master| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "base/basictypes.h" | 5 #include "base/basictypes.h" |
| 6 #include "base/memory/scoped_ptr.h" | 6 #include "base/memory/scoped_ptr.h" |
| 7 #include "base/time/time.h" | 7 #include "base/time/time.h" |
| 8 #include "content/browser/devtools/devtools_manager.h" | 8 #include "content/browser/devtools/devtools_manager.h" |
| 9 #include "content/browser/devtools/embedded_worker_devtools_manager.h" | 9 #include "content/browser/devtools/embedded_worker_devtools_manager.h" |
| 10 #include "content/browser/devtools/render_view_devtools_agent_host.h" | 10 #include "content/browser/devtools/render_view_devtools_agent_host.h" |
| (...skipping 192 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 203 | 203 |
| 204 protected: | 204 protected: |
| 205 void SetUp() override { | 205 void SetUp() override { |
| 206 RenderViewHostImplTestHarness::SetUp(); | 206 RenderViewHostImplTestHarness::SetUp(); |
| 207 TestDevToolsClientHost::ResetCounters(); | 207 TestDevToolsClientHost::ResetCounters(); |
| 208 old_browser_client_ = SetBrowserClientForTesting(&browser_client_); | 208 old_browser_client_ = SetBrowserClientForTesting(&browser_client_); |
| 209 } | 209 } |
| 210 | 210 |
| 211 void TearDown() override { | 211 void TearDown() override { |
| 212 SetBrowserClientForTesting(old_browser_client_); | 212 SetBrowserClientForTesting(old_browser_client_); |
| 213 DevToolsManager::GetInstance()->SetUpForTest(DevToolsManager::Scheduler()); | |
| 213 RenderViewHostImplTestHarness::TearDown(); | 214 RenderViewHostImplTestHarness::TearDown(); |
| 214 } | 215 } |
| 215 | 216 |
| 216 ContentBrowserClientWithDevTools browser_client_; | 217 ContentBrowserClientWithDevTools browser_client_; |
| 217 ContentBrowserClient* old_browser_client_; | 218 ContentBrowserClient* old_browser_client_; |
| 218 }; | 219 }; |
| 219 | 220 |
| 220 TEST_F(DevToolsManagerTest, OpenAndManuallyCloseDevToolsClientHost) { | 221 TEST_F(DevToolsManagerTest, OpenAndManuallyCloseDevToolsClientHost) { |
| 221 scoped_refptr<DevToolsAgentHost> agent( | 222 scoped_refptr<DevToolsAgentHost> agent( |
| 222 DevToolsAgentHost::GetOrCreateFor(web_contents())); | 223 DevToolsAgentHost::GetOrCreateFor(web_contents())); |
| (...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 378 base::Closure closure_; | 379 base::Closure closure_; |
| 379 }; | 380 }; |
| 380 | 381 |
| 381 TEST_F(DevToolsManagerTest, TestObserver) { | 382 TEST_F(DevToolsManagerTest, TestObserver) { |
| 382 GURL url1("data:text/html,<body>Body1</body>"); | 383 GURL url1("data:text/html,<body>Body1</body>"); |
| 383 GURL url2("data:text/html,<body>Body2</body>"); | 384 GURL url2("data:text/html,<body>Body2</body>"); |
| 384 GURL url3("data:text/html,<body>Body3</body>"); | 385 GURL url3("data:text/html,<body>Body3</body>"); |
| 385 | 386 |
| 386 TestDevToolsManagerScheduler scheduler; | 387 TestDevToolsManagerScheduler scheduler; |
| 387 DevToolsManager* manager = DevToolsManager::GetInstance(); | 388 DevToolsManager* manager = DevToolsManager::GetInstance(); |
| 388 manager->SetSchedulerForTest(scheduler.callback()); | 389 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
| |
| 389 | 390 |
| 390 contents()->NavigateAndCommit(url1); | 391 contents()->NavigateAndCommit(url1); |
| 391 RunAllPendingInMessageLoop(); | 392 RunAllPendingInMessageLoop(); |
| 392 | 393 |
| 393 scoped_ptr<TestDevToolsManagerObserver> observer( | 394 scoped_ptr<TestDevToolsManagerObserver> observer( |
| 394 new TestDevToolsManagerObserver()); | 395 new TestDevToolsManagerObserver()); |
| 395 manager->AddObserver(observer.get()); | 396 manager->AddObserver(observer.get()); |
| 396 // Added observer should get an update. | 397 // Added observer should get an update. |
| 397 EXPECT_EQ(1, observer->updates_count()); | 398 EXPECT_EQ(1, observer->updates_count()); |
| 398 ASSERT_EQ(1u, observer->hosts().size()); | 399 ASSERT_EQ(1u, observer->hosts().size()); |
| (...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 447 EXPECT_EQ(url2.spec(), observer->hosts()[0]->GetURL().spec()); | 448 EXPECT_EQ(url2.spec(), observer->hosts()[0]->GetURL().spec()); |
| 448 | 449 |
| 449 // Check there were no extra updates. | 450 // Check there were no extra updates. |
| 450 scheduler.Run(); | 451 scheduler.Run(); |
| 451 EXPECT_TRUE(scheduler.IsEmpty()); | 452 EXPECT_TRUE(scheduler.IsEmpty()); |
| 452 EXPECT_EQ(4, observer->updates_count()); | 453 EXPECT_EQ(4, observer->updates_count()); |
| 453 | 454 |
| 454 manager->RemoveObserver(observer.get()); | 455 manager->RemoveObserver(observer.get()); |
| 455 | 456 |
| 456 EXPECT_TRUE(scheduler.IsEmpty()); | 457 EXPECT_TRUE(scheduler.IsEmpty()); |
| 457 manager->SetSchedulerForTest(DevToolsManager::Scheduler()); | |
| 458 } | 458 } |
| 459 | 459 |
| 460 } // namespace content | 460 } // namespace content |
| OLD | NEW |
