Fix the full tab mode unload event test by moving the FileDownload expectation before the

testing::InSequence specification and getting rid of the duplicate FileDownload expectations.

TBR=amit

Review URL: http://codereview.chromium.org/661385

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40409 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 4 insertions, 12 deletions

diff --git a/chrome_frame/test/test_mock_with_web_server.cc b/chrome_frame/test/test_mock_with_web_server.cc
index c376638..e7f108e 100644
--- a/chrome_frame/test/test_mock_with_web_server.cc
+++ b/chrome_frame/test/test_mock_with_web_server.cc
@@ -774,6 +774,10 @@ TEST_F(ChromeFrameTestWithWebServer, FullTabModeIE_UnloadEventTest) {
   CloseIeAtEndOfScope last_resort_close_ie;
   chrome_frame_test::TimedMsgLoop loop;
   ComStackObjectWithUninitialize<MockWebBrowserEventSink> mock;
+
+  EXPECT_CALL(mock, OnFileDownload(VARIANT_TRUE, _))
+      .Times(testing::AnyNumber()).WillRepeatedly(testing::Return());
+
   ::testing::InSequence sequence;   // Everything in sequence
 
   // We will get two BeforeNavigate2/OnNavigateComplete2 notifications due to
@@ -786,9 +790,6 @@ TEST_F(ChromeFrameTestWithWebServer, FullTabModeIE_UnloadEventTest) {
           _, _, _, _, _))
       .WillOnce(testing::Return(S_OK));
 
-  EXPECT_CALL(mock, OnFileDownload(VARIANT_TRUE, _))
-      .WillOnce(testing::Return());
-
   EXPECT_CALL(mock, OnNavigateComplete2(_, _))
       .WillOnce(testing::Return());
 
@@ -800,9 +801,6 @@ TEST_F(ChromeFrameTestWithWebServer, FullTabModeIE_UnloadEventTest) {
           _, _, _, _, _))
       .Times(testing::AnyNumber()).WillRepeatedly(testing::Return(S_OK));
 
-  EXPECT_CALL(mock, OnFileDownload(VARIANT_TRUE, _))
-      .WillOnce(testing::Return());
-
   EXPECT_CALL(mock, OnNavigateComplete2(_, _))
       .Times(testing::AnyNumber()).WillRepeatedly(testing::Return());
 
@@ -818,9 +816,6 @@ TEST_F(ChromeFrameTestWithWebServer, FullTabModeIE_UnloadEventTest) {
           _, _, _, _, _))
       .WillOnce(testing::Return(S_OK));
 
-  EXPECT_CALL(mock, OnFileDownload(VARIANT_TRUE, _))
-      .WillOnce(testing::Return());
-
   EXPECT_CALL(mock, OnNavigateComplete2(_, _))
       .WillOnce(testing::Return());
 
@@ -832,9 +827,6 @@ TEST_F(ChromeFrameTestWithWebServer, FullTabModeIE_UnloadEventTest) {
           _, _, _, _, _))
       .Times(testing::AnyNumber()).WillRepeatedly(testing::Return(S_OK));
 
-  EXPECT_CALL(mock, OnFileDownload(VARIANT_TRUE, _))
-      .WillOnce(testing::Return());
-
   EXPECT_CALL(mock, OnNavigateComplete2(_, _))
       .Times(testing::AnyNumber()).WillRepeatedly(testing::Return());