| OLD | NEW |
| 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 1366 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1377 ASSERT_TRUE(mock.web_browser2() != NULL); | 1377 ASSERT_TRUE(mock.web_browser2() != NULL); |
| 1378 | 1378 |
| 1379 loop.RunFor(kChromeFrameLongNavigationTimeoutInSeconds); | 1379 loop.RunFor(kChromeFrameLongNavigationTimeoutInSeconds); |
| 1380 | 1380 |
| 1381 mock.Uninitialize(); | 1381 mock.Uninitialize(); |
| 1382 chrome_frame_test::CloseAllIEWindows(); | 1382 chrome_frame_test::CloseAllIEWindows(); |
| 1383 } | 1383 } |
| 1384 | 1384 |
| 1385 const wchar_t kChromeFrameFullTabModeKeyEventUrl[] = L"files/keyevent.html"; | 1385 const wchar_t kChromeFrameFullTabModeKeyEventUrl[] = L"files/keyevent.html"; |
| 1386 | 1386 |
| 1387 TEST_F(ChromeFrameTestWithWebServer, FullTabModeIE_ChromeFrameKeyboardTest) { | 1387 // Marking this test FLAKY as it fails at times on the buildbot. |
| 1388 // http://code.google.com/p/chromium/issues/detail?id=26549 |
| 1389 TEST_F(ChromeFrameTestWithWebServer, FLAKY_FullTabModeIE_ChromeFrameKeyboardTest
) { |
| 1388 chrome_frame_test::TimedMsgLoop loop; | 1390 chrome_frame_test::TimedMsgLoop loop; |
| 1389 | 1391 |
| 1390 ASSERT_TRUE(LaunchBrowser(IE, kChromeFrameFullTabModeKeyEventUrl)); | 1392 ASSERT_TRUE(LaunchBrowser(IE, kChromeFrameFullTabModeKeyEventUrl)); |
| 1391 | 1393 |
| 1392 // Allow some time for chrome to be launched. | 1394 // Allow some time for chrome to be launched. |
| 1393 loop.RunFor(kChromeFrameLaunchDelay); | 1395 loop.RunFor(kChromeFrameLaunchDelay); |
| 1394 | 1396 |
| 1395 HWND renderer_window = chrome_frame_test::GetChromeRendererWindow(); | 1397 HWND renderer_window = chrome_frame_test::GetChromeRendererWindow(); |
| 1396 EXPECT_TRUE(IsWindow(renderer_window)); | 1398 EXPECT_TRUE(IsWindow(renderer_window)); |
| 1397 | 1399 |
| (...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1535 chrome_frame_test::CloseAllIEWindows(); | 1537 chrome_frame_test::CloseAllIEWindows(); |
| 1536 } | 1538 } |
| 1537 | 1539 |
| 1538 const wchar_t kAnchorUrl[] = L"http://localhost:1337/files/anchor.html"; | 1540 const wchar_t kAnchorUrl[] = L"http://localhost:1337/files/anchor.html"; |
| 1539 const wchar_t kAnchor1Url[] = L"http://localhost:1337/files/anchor.html#a1"; | 1541 const wchar_t kAnchor1Url[] = L"http://localhost:1337/files/anchor.html#a1"; |
| 1540 const wchar_t kAnchor2Url[] = L"http://localhost:1337/files/anchor.html#a2"; | 1542 const wchar_t kAnchor2Url[] = L"http://localhost:1337/files/anchor.html#a2"; |
| 1541 const wchar_t kAnchor3Url[] = L"http://localhost:1337/files/anchor.html#a3"; | 1543 const wchar_t kAnchor3Url[] = L"http://localhost:1337/files/anchor.html#a3"; |
| 1542 | 1544 |
| 1543 // Full tab mode back/forward test | 1545 // Full tab mode back/forward test |
| 1544 // Launch and navigate chrome frame to a set of URLs and test back forward | 1546 // Launch and navigate chrome frame to a set of URLs and test back forward |
| 1545 TEST_F(ChromeFrameTestWithWebServer, FullTabModeIE_BackForwardAnchor) { | 1547 // Marking this test FLAKY as it fails at times on the buildbot. |
| 1548 // http://code.google.com/p/chromium/issues/detail?id=26549 |
| 1549 TEST_F(ChromeFrameTestWithWebServer, FLAKY_FullTabModeIE_BackForwardAnchor) { |
| 1546 const char tab_enter_keystrokes[] = { VK_TAB, VK_RETURN, 0 }; | 1550 const char tab_enter_keystrokes[] = { VK_TAB, VK_RETURN, 0 }; |
| 1547 static const std::string tab_enter(tab_enter_keystrokes); | 1551 static const std::string tab_enter(tab_enter_keystrokes); |
| 1548 chrome_frame_test::TimedMsgLoop loop; | 1552 chrome_frame_test::TimedMsgLoop loop; |
| 1549 CComObjectStackEx<MockWebBrowserEventSink> mock; | 1553 CComObjectStackEx<MockWebBrowserEventSink> mock; |
| 1550 ::testing::InSequence sequence; // Everything in sequence | 1554 ::testing::InSequence sequence; // Everything in sequence |
| 1551 | 1555 |
| 1552 // Back/Forward state at this point: | 1556 // Back/Forward state at this point: |
| 1553 // Back: 0 | 1557 // Back: 0 |
| 1554 // Forward: 0 | 1558 // Forward: 0 |
| 1555 EXPECT_CALL(mock, OnBeforeNavigate2(_, testing::Field(&VARIANT::bstrVal, | 1559 EXPECT_CALL(mock, OnBeforeNavigate2(_, testing::Field(&VARIANT::bstrVal, |
| (...skipping 207 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1763 chrome_frame_test::TimedMsgLoop loop; | 1767 chrome_frame_test::TimedMsgLoop loop; |
| 1764 | 1768 |
| 1765 ASSERT_TRUE(LaunchBrowser(IE, kChromeFrameFullTabModeDeleteCookieTest)); | 1769 ASSERT_TRUE(LaunchBrowser(IE, kChromeFrameFullTabModeDeleteCookieTest)); |
| 1766 | 1770 |
| 1767 loop.RunFor(kChromeFrameLongNavigationTimeoutInSeconds); | 1771 loop.RunFor(kChromeFrameLongNavigationTimeoutInSeconds); |
| 1768 | 1772 |
| 1769 chrome_frame_test::CloseAllIEWindows(); | 1773 chrome_frame_test::CloseAllIEWindows(); |
| 1770 ASSERT_TRUE(CheckResultFile(L"FullTab_DeleteCookieTest", "OK")); | 1774 ASSERT_TRUE(CheckResultFile(L"FullTab_DeleteCookieTest", "OK")); |
| 1771 } | 1775 } |
| 1772 | 1776 |
| OLD | NEW |