diff options
| author | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-19 23:49:26 +0000 |
|---|---|---|
| committer | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-19 23:49:26 +0000 |
| commit | 0b7a012d120787fe67d72f47a5ef695c7405fff6 (patch) | |
| tree | 662f9b40bfbff90795a2ecc2fa2c744872eefe94 /chrome_frame/test/navigation_test.cc | |
| parent | 1af1dfeff5d142a28b69906ac544be6675e6bf7a (diff) | |
| download | chromium_src-0b7a012d120787fe67d72f47a5ef695c7405fff6.zip chromium_src-0b7a012d120787fe67d72f47a5ef695c7405fff6.tar.gz chromium_src-0b7a012d120787fe67d72f47a5ef695c7405fff6.tar.bz2 | |
Remove usage of the old page info dialogs in ChromeFrame and use the new page info bubble
instead. Changed the expectations of the corresponding chrome frame ui test to look for
this window.
Added support in ChromeFrame tests window watcher class to allow specifying window class names
as well.
Fixes bug http://code.google.com/p/chromium/issues/detail?id=59030
Bug=59030
Review URL: http://codereview.chromium.org/3864001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@63138 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/test/navigation_test.cc')
| -rw-r--r-- | chrome_frame/test/navigation_test.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome_frame/test/navigation_test.cc b/chrome_frame/test/navigation_test.cc index c1c2e7e..f11f3e6 100644 --- a/chrome_frame/test/navigation_test.cc +++ b/chrome_frame/test/navigation_test.cc @@ -308,7 +308,7 @@ TEST_P(FullTabNavigationTest, FLAKY_RestrictedSite) { testing::Field(&VARIANT::bstrVal, testing::StrCaseEq(GetSimplePageUrl())), _, _, _, _, _)) .Times(1) - .WillOnce(WatchWindow(&win_observer_mock, kAlertDlgCaption)); + .WillOnce(WatchWindow(&win_observer_mock, kAlertDlgCaption, "")); if (patch_method == PATCH_METHOD_INET_PROTOCOL) { EXPECT_CALL(ie_mock_, OnBeforeNavigate2( @@ -742,10 +742,10 @@ void CloseWindow(HWND* window) { // and validate that all is well. TEST_F(FullTabDownloadTest, CF_DownloadFileFromPost) { chrome_frame_test::MockWindowObserver download_watcher; - download_watcher.WatchWindow("File Download"); + download_watcher.WatchWindow("File Download", ""); chrome_frame_test::MockWindowObserver save_dialog_watcher; - save_dialog_watcher.WatchWindow("Save As"); + save_dialog_watcher.WatchWindow("Save As", ""); EXPECT_CALL(server_mock_, Get(_, StrEq(L"/post_source.html"), _)).WillOnce( SendFast( |