Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2)

Side by Side Diff: chrome_frame/test/chrome_frame_unittests.cc

Issue 348051: Marking the AboutChromeFrame test flaky. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 11 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 #include <windows.h> 4 #include <windows.h>
5 #include <stdarg.h> 5 #include <stdarg.h>
6 6
7 // IShellWindows includes. Unfortunately we can't keep these in 7 // IShellWindows includes. Unfortunately we can't keep these in
8 // alphabetic order since exdisp will bark if some interfaces aren't fully 8 // alphabetic order since exdisp will bark if some interfaces aren't fully
9 // defined. 9 // defined.
10 #include <mshtml.h> 10 #include <mshtml.h>
(...skipping 1461 matching lines...) Expand 10 before | Expand all | Expand 10 after
1472 L"cf:about:version"; 1472 L"cf:about:version";
1473 1473
1474 // This test launches chrome frame in full tab mode in IE by having IE navigate 1474 // This test launches chrome frame in full tab mode in IE by having IE navigate
1475 // to cf:about:blank. It then looks for the chrome renderer window and posts 1475 // to cf:about:blank. It then looks for the chrome renderer window and posts
1476 // the WM_RBUTTONDOWN/WM_RBUTTONUP messages to it, which bring up the context 1476 // the WM_RBUTTONDOWN/WM_RBUTTONUP messages to it, which bring up the context
1477 // menu. This is followed by keyboard messages sent via SendInput to select 1477 // menu. This is followed by keyboard messages sent via SendInput to select
1478 // the About chrome frame menu option, which would then bring up a new window 1478 // the About chrome frame menu option, which would then bring up a new window
1479 // with the chrome revision. The test finally checks for success by comparing 1479 // with the chrome revision. The test finally checks for success by comparing
1480 // the URL of the window being opened with cf:about:version, which indicates 1480 // the URL of the window being opened with cf:about:version, which indicates
1481 // that the operation succeeded. 1481 // that the operation succeeded.
1482 TEST_F(ChromeFrameTestWithWebServer, FullTabModeIE_AboutChromeFrame) { 1482 TEST_F(ChromeFrameTestWithWebServer, FLAKY_FullTabModeIE_AboutChromeFrame) {
1483 TimedMsgLoop loop; 1483 TimedMsgLoop loop;
1484 1484
1485 CComObjectStackEx<MockWebBrowserEventSink> mock; 1485 CComObjectStackEx<MockWebBrowserEventSink> mock;
1486 1486
1487 EXPECT_CALL(mock, 1487 EXPECT_CALL(mock,
1488 OnBeforeNavigate2(_, testing::Field(&VARIANT::bstrVal, 1488 OnBeforeNavigate2(_, testing::Field(&VARIANT::bstrVal,
1489 testing::StrCaseEq(kChromeFrameAboutBlankUrl)), 1489 testing::StrCaseEq(kChromeFrameAboutBlankUrl)),
1490 _, _, _, _, _)) 1490 _, _, _, _, _))
1491 .Times(1) 1491 .Times(1)
1492 .WillOnce(testing::Return(S_OK)); 1492 .WillOnce(testing::Return(S_OK));
(...skipping 15 matching lines...) Expand all
1508 return; 1508 return;
1509 1509
1510 ASSERT_TRUE(mock.web_browser2() != NULL); 1510 ASSERT_TRUE(mock.web_browser2() != NULL);
1511 1511
1512 loop.RunFor(kChromeFrameLongNavigationTimeoutInSeconds); 1512 loop.RunFor(kChromeFrameLongNavigationTimeoutInSeconds);
1513 1513
1514 mock.Uninitialize(); 1514 mock.Uninitialize();
1515 chrome_frame_test::CloseAllIEWindows(); 1515 chrome_frame_test::CloseAllIEWindows();
1516 } 1516 }
1517 1517
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698