diff options
author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-01-25 11:39:07 +0100 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-01-25 15:20:42 +0000 |
commit | 6c91641271e536ffaa88a1dff5127e42ee99a91e (patch) | |
tree | 703d9dd49602377ddc90cbf886aad37913f2496b /chromium/content/browser/devtools/devtools_manager_unittest.cc | |
parent | b145b7fafd36f0c260d6a768c81fc14e32578099 (diff) | |
download | qtwebengine-chromium-6c91641271e536ffaa88a1dff5127e42ee99a91e.tar.gz |
BASELINE: Update Chromium to 49.0.2623.23
Also adds missing printing sources.
Change-Id: I3726b8f0c7d6751c9fc846096c571fadca7108cd
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'chromium/content/browser/devtools/devtools_manager_unittest.cc')
-rw-r--r-- | chromium/content/browser/devtools/devtools_manager_unittest.cc | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/chromium/content/browser/devtools/devtools_manager_unittest.cc b/chromium/content/browser/devtools/devtools_manager_unittest.cc index e2870c8ee03..24d8dc0d5f4 100644 --- a/chromium/content/browser/devtools/devtools_manager_unittest.cc +++ b/chromium/content/browser/devtools/devtools_manager_unittest.cc @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/basictypes.h" #include "base/location.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/single_thread_task_runner.h" #include "base/thread_task_runner_handle.h" @@ -141,10 +141,11 @@ TEST_F(DevToolsManagerTest, NoUnresponsiveDialogInInspectedContents) { client_host.InspectAgentHost(agent_host.get()); // Start with a short timeout. - inspected_rvh->StartHangMonitorTimeout(TimeDelta::FromMilliseconds(10)); + inspected_rvh->GetWidget()->StartHangMonitorTimeout( + TimeDelta::FromMilliseconds(10)); // Wait long enough for first timeout and see if it fired. base::ThreadTaskRunnerHandle::Get()->PostDelayedTask( - FROM_HERE, base::MessageLoop::QuitClosure(), + FROM_HERE, base::MessageLoop::QuitWhenIdleClosure(), TimeDelta::FromMilliseconds(10)); base::MessageLoop::current()->Run(); EXPECT_FALSE(delegate.renderer_unresponsive_received()); @@ -152,10 +153,11 @@ TEST_F(DevToolsManagerTest, NoUnresponsiveDialogInInspectedContents) { // Now close devtools and check that the notification is delivered. client_host.Close(); // Start with a short timeout. - inspected_rvh->StartHangMonitorTimeout(TimeDelta::FromMilliseconds(10)); + inspected_rvh->GetWidget()->StartHangMonitorTimeout( + TimeDelta::FromMilliseconds(10)); // Wait long enough for first timeout and see if it fired. base::ThreadTaskRunnerHandle::Get()->PostDelayedTask( - FROM_HERE, base::MessageLoop::QuitClosure(), + FROM_HERE, base::MessageLoop::QuitWhenIdleClosure(), TimeDelta::FromMilliseconds(10)); base::MessageLoop::current()->Run(); EXPECT_TRUE(delegate.renderer_unresponsive_received()); |