diff options
| author | ajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-12 07:53:49 +0000 |
|---|---|---|
| committer | ajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-12 07:53:49 +0000 |
| commit | 911bea46277c806a2c76cb093cd79938d74392b9 (patch) | |
| tree | ed93fcfb151d6817b6cb8f7ffda6cdbe1086c328 /chrome/browser/extensions/app_process_apitest.cc | |
| parent | d83f1c1a0be3c53cf451293c7160f0eef8fc8913 (diff) | |
| download | chromium_src-911bea46277c806a2c76cb093cd79938d74392b9.zip chromium_src-911bea46277c806a2c76cb093cd79938d74392b9.tar.gz chromium_src-911bea46277c806a2c76cb093cd79938d74392b9.tar.bz2 | |
Revert "Eliminate WaitForNavigation."
This reverts commit r105015. It makes IncognitoYesScript flaky. Does TestNotificationObserver correctly handle incognito windows?
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/8242003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@105033 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/app_process_apitest.cc')
| -rw-r--r-- | chrome/browser/extensions/app_process_apitest.cc | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/chrome/browser/extensions/app_process_apitest.cc b/chrome/browser/extensions/app_process_apitest.cc index 33f8fcc9..06d80f2 100644 --- a/chrome/browser/extensions/app_process_apitest.cc +++ b/chrome/browser/extensions/app_process_apitest.cc @@ -387,15 +387,8 @@ IN_PROC_BROWSER_TEST_F(AppApiTest, OpenAppFromIframe) { TabContents* newtab = last_active_browser->GetSelectedTabContents(); EXPECT_TRUE(newtab); if (!newtab->controller().GetLastCommittedEntry() || - newtab->controller().GetLastCommittedEntry()->url() != app_url) { - // TODO(gbillock): This still looks racy. Need to make a custom - // observer to intercept new window creation and then look for - // NAV_ENTRY_COMMITTED on the new tab there. - ui_test_utils::WindowedNotificationObserver observer( - content::NOTIFICATION_NAV_ENTRY_COMMITTED, - Source<NavigationController>(&(newtab->controller()))); - observer.Wait(); - } + newtab->controller().GetLastCommittedEntry()->url() != app_url) + ui_test_utils::WaitForNavigation(&newtab->controller()); // Popup window should be in the app's process. EXPECT_TRUE(extension_process_manager->IsExtensionProcess( @@ -426,9 +419,6 @@ IN_PROC_BROWSER_TEST_F(AppApiTest, OpenWebPopupFromWebIframe) { const Extension* app = LoadExtension(test_data_dir_.AppendASCII("app_process")); ASSERT_TRUE(app); - ui_test_utils::WindowedNotificationObserver observer( - content::NOTIFICATION_LOAD_STOP, - NotificationService::AllSources()); ui_test_utils::NavigateToURLWithDisposition( browser(), base_url.Resolve("path1/container.html"), @@ -455,7 +445,9 @@ IN_PROC_BROWSER_TEST_F(AppApiTest, OpenWebPopupFromWebIframe) { TabContents* newtab = last_active_browser->GetSelectedTabContents(); EXPECT_TRUE(newtab); GURL non_app_url = base_url.Resolve("path3/empty.html"); - observer.Wait(); + if (!newtab->controller().GetLastCommittedEntry() || + newtab->controller().GetLastCommittedEntry()->url() != non_app_url) + ui_test_utils::WaitForNavigation(&newtab->controller()); // Popup window should be in the app's process. RenderProcessHost* popup_process = |