diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-01 04:30:42 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-01 04:30:42 +0000 |
| commit | b2a92946ed1b5b36910c57eda38f3699da4484ca (patch) | |
| tree | d16e8ac224663f23aca2af65597bc237e02e71f2 /chrome/browser/debugger/devtools_sanity_unittest.cc | |
| parent | bfbcc6c91900a3055cc34cdb606543b4685102dd (diff) | |
| download | chromium_src-b2a92946ed1b5b36910c57eda38f3699da4484ca.zip chromium_src-b2a92946ed1b5b36910c57eda38f3699da4484ca.tar.gz chromium_src-b2a92946ed1b5b36910c57eda38f3699da4484ca.tar.bz2 | |
Revert 99099 (TaskManagerBrowserTest.NoticeHostedAppTabs started failing,
speculatively reverting this one since it looks related.)
- Fix up more WaitForNavigation calls. Almost all fixed now.
R=phajdan.jr@chromium.org
BUG=None.
TEST=brower_tests,ui_tests
Review URL: http://codereview.chromium.org/7745037
TBR=gbillock@chromium.org
Review URL: http://codereview.chromium.org/7825003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@99124 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 6410108..5e8ad78 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_); - observer.Wait(); + RenderViewHost* client_rvh = window_->GetRenderViewHost(); + TabContents* client_contents = client_rvh->delegate()->GetAsTabContents(); + ui_test_utils::WaitForNavigation(&client_contents->controller()); } TabContents* GetInspectedTab() { |