Fix for the CtrlN ChromeFrame test failures on IE7. On IE7 it appears that we...

Fix for the CtrlN ChromeFrame test failures on IE7. On IE7 it appears that we receive
two window open notifications for the window pattern Internet Explorer*. Not clear why.

Updated the expectations of the test to account for this.


Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=65603

[amit, 2010-11-09 23:35:52]

Could it be related to switching to-from protected mode? Also, no such issue
on IE8?

LGTM with Times(AtMost(2)) and then you don't need a special case for IE7.


On Tue, Nov 9, 2010 at 3:17 PM, <ananta@chromium.org> wrote:

> Reviewers: amit,
>
> Description:
> Fix for the CtrlN ChromeFrame test failures on IE7. On IE7 it appears that
> we
> receive
> two window open notifications for the window pattern Internet Explorer*.
> Not
> clear why.
>
> Updated the expectations of the test to account for this.
>
>
> Please review this at http://codereview.chromium.org/4700003/
>
> SVN Base: svn://svn.chromium.org/chrome/trunk/src/
>
> Affected files:
>  M     chrome_frame/test/ui_test.cc
>
>
> Index: chrome_frame/test/ui_test.cc
> ===================================================================
> --- chrome_frame/test/ui_test.cc        (revision 65344)
> +++ chrome_frame/test/ui_test.cc        (working copy)
> @@ -129,8 +129,15 @@
>
>   // Watch for new window. It appears that the window close message cannot
> be
>   // reliably delivered immediately upon receipt of the window open event.
> -  EXPECT_CALL(win_observer_mock, OnWindowOpen(_))
> -      .WillOnce(DelayDoCloseWindow(500));
> +  if (GetInstalledIEVersion() == IE_7) {
> +    EXPECT_CALL(win_observer_mock, OnWindowOpen(_))
> +        .Times(2)
> +        .WillOnce(DelayDoCloseWindow(500))
> +        .WillOnce(testing::Return());
> +  } else {
> +    EXPECT_CALL(win_observer_mock, OnWindowOpen(_))
> +        .WillOnce(DelayDoCloseWindow(500));
> +  }
>
>   EXPECT_CALL(win_observer_mock, OnWindowClose(_))
>       .WillOnce(CloseBrowserMock(&ie_mock_));
>
>
>