diff options
| author | gbillock@chromium.org <gbillock@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-12 20:09:05 +0000 |
|---|---|---|
| committer | gbillock@chromium.org <gbillock@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-12 20:09:05 +0000 |
| commit | 3114db2cefe843ddd19ab6961fbd944b9f9e32ae (patch) | |
| tree | 9fe715901c7bb81f9fed97ddc20a124515f81eb2 /chrome/browser/debugger/devtools_sanity_unittest.cc | |
| parent | 62cccdac4221f25d83c84da8da70e7c540d4af35 (diff) | |
| download | chromium_src-3114db2cefe843ddd19ab6961fbd944b9f9e32ae.zip chromium_src-3114db2cefe843ddd19ab6961fbd944b9f9e32ae.tar.gz chromium_src-3114db2cefe843ddd19ab6961fbd944b9f9e32ae.tar.bz2 | |
Revert 99124: Revert 99099 Fix up more WaitForNavigation calls.
Revert task manager test. This one looks to be more complicated.
See http://codereview.chromium.org/7745037/ (original review)
R=phajdan.jr@chromium.org
BUG=None.
TEST=browser_tests,ui_tests
Review URL: http://codereview.chromium.org/7831020
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@100749 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/debugger/devtools_sanity_unittest.cc')
| -rw-r--r-- | chrome/browser/debugger/devtools_sanity_unittest.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/debugger/devtools_sanity_unittest.cc b/chrome/browser/debugger/devtools_sanity_unittest.cc index f8280ff..dd0dfc9 100644 --- a/chrome/browser/debugger/devtools_sanity_unittest.cc +++ b/chrome/browser/debugger/devtools_sanity_unittest.cc @@ -116,11 +116,11 @@ class DevToolsSanityTest : public InProcessBrowserTest { GURL url = test_server()->GetURL(test_page); ui_test_utils::NavigateToURL(browser(), url); + ui_test_utils::WindowedNotificationObserver observer( + content::NOTIFICATION_LOAD_STOP, NotificationService::AllSources()); inspected_rvh_ = GetInspectedTab()->render_view_host(); window_ = DevToolsWindow::OpenDevToolsWindow(inspected_rvh_); - RenderViewHost* client_rvh = window_->GetRenderViewHost(); - TabContents* client_contents = client_rvh->delegate()->GetAsTabContents(); - ui_test_utils::WaitForNavigation(&client_contents->controller()); + observer.Wait(); } TabContents* GetInspectedTab() { |