| 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 556 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 567 SimpleBrowserTest(IE, kCFIDefaultCtorPage, L"CFInstanceDefaultCtor"); | 567 SimpleBrowserTest(IE, kCFIDefaultCtorPage, L"CFInstanceDefaultCtor"); |
| 568 } | 568 } |
| 569 | 569 |
| 570 TEST_F(ChromeFrameTestWithWebServer, WidgetModeFF_CFInstanceDefaultCtor) { | 570 TEST_F(ChromeFrameTestWithWebServer, WidgetModeFF_CFInstanceDefaultCtor) { |
| 571 SimpleBrowserTest(FIREFOX, kCFIDefaultCtorPage, L"CFInstanceDefaultCtor"); | 571 SimpleBrowserTest(FIREFOX, kCFIDefaultCtorPage, L"CFInstanceDefaultCtor"); |
| 572 } | 572 } |
| 573 | 573 |
| 574 | 574 |
| 575 const wchar_t kCFInstallBasicTestPage[] = L"files/CFInstall_basic.html"; | 575 const wchar_t kCFInstallBasicTestPage[] = L"files/CFInstall_basic.html"; |
| 576 | 576 |
| 577 // Disabling the following tests as the consistently fail on the chrome frame | 577 TEST_F(ChromeFrameTestWithWebServer, FullTabIE_CFInstallBasic) { |
| 578 // builder. | |
| 579 // 1. FullTabIE_CFInstallBasic | |
| 580 // 2. FullTabIE_CFInstallDismiss | |
| 581 // 3. FullTabIE_CFInstallOverlay | |
| 582 // 4. FullTabIE_CFInstallPlace | |
| 583 // Issue:- http://code.google.com/p/chromium/issues/detail?id=29193 | |
| 584 TEST_F(ChromeFrameTestWithWebServer, DISABLED_FullTabIE_CFInstallBasic) { | |
| 585 SimpleBrowserTest(IE, kCFInstallBasicTestPage, L"CFInstallBasic"); | 578 SimpleBrowserTest(IE, kCFInstallBasicTestPage, L"CFInstallBasic"); |
| 586 } | 579 } |
| 587 | 580 |
| 588 const wchar_t kCFInstallPlaceTestPage[] = L"files/CFInstall_place.html"; | 581 const wchar_t kCFInstallPlaceTestPage[] = L"files/CFInstall_place.html"; |
| 589 | 582 |
| 590 TEST_F(ChromeFrameTestWithWebServer, DISABLED_FullTabIE_CFInstallPlace) { | 583 TEST_F(ChromeFrameTestWithWebServer, FullTabIE_CFInstallPlace) { |
| 591 SimpleBrowserTest(IE, kCFInstallPlaceTestPage, L"CFInstallPlace"); | 584 SimpleBrowserTest(IE, kCFInstallPlaceTestPage, L"CFInstallPlace"); |
| 592 } | 585 } |
| 593 | 586 |
| 594 const wchar_t kCFInstallOverlayTestPage[] = L"files/CFInstall_overlay.html"; | 587 const wchar_t kCFInstallOverlayTestPage[] = L"files/CFInstall_overlay.html"; |
| 595 | 588 |
| 596 TEST_F(ChromeFrameTestWithWebServer, DISABLED_FullTabIE_CFInstallOverlay) { | 589 TEST_F(ChromeFrameTestWithWebServer, FullTabIE_CFInstallOverlay) { |
| 597 SimpleBrowserTest(IE, kCFInstallOverlayTestPage, L"CFInstallOverlay"); | 590 SimpleBrowserTest(IE, kCFInstallOverlayTestPage, L"CFInstallOverlay"); |
| 598 } | 591 } |
| 599 | 592 |
| 600 const wchar_t kCFInstallDismissTestPage[] = L"files/CFInstall_dismiss.html"; | 593 const wchar_t kCFInstallDismissTestPage[] = L"files/CFInstall_dismiss.html"; |
| 601 | 594 |
| 602 TEST_F(ChromeFrameTestWithWebServer, DISABLED_FullTabIE_CFInstallDismiss) { | 595 TEST_F(ChromeFrameTestWithWebServer, FullTabIE_CFInstallDismiss) { |
| 603 SimpleBrowserTest(IE, kCFInstallDismissTestPage, L"CFInstallDismiss"); | 596 SimpleBrowserTest(IE, kCFInstallDismissTestPage, L"CFInstallDismiss"); |
| 604 } | 597 } |
| 605 | 598 |
| 606 const wchar_t kInitializeHiddenPage[] = L"files/initialize_hidden.html"; | 599 const wchar_t kInitializeHiddenPage[] = L"files/initialize_hidden.html"; |
| 607 | 600 |
| 608 TEST_F(ChromeFrameTestWithWebServer, WidgetModeIE_InitializeHidden) { | 601 TEST_F(ChromeFrameTestWithWebServer, WidgetModeIE_InitializeHidden) { |
| 609 SimpleBrowserTest(IE, kInitializeHiddenPage, L"InitializeHidden"); | 602 SimpleBrowserTest(IE, kInitializeHiddenPage, L"InitializeHidden"); |
| 610 } | 603 } |
| 611 | 604 |
| 612 TEST_F(ChromeFrameTestWithWebServer, WidgetModeFF_InitializeHidden) { | 605 TEST_F(ChromeFrameTestWithWebServer, WidgetModeFF_InitializeHidden) { |
| (...skipping 832 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1445 | 1438 |
| 1446 const wchar_t kChromeFrameFullTabWindowOpenTestUrl[] = | 1439 const wchar_t kChromeFrameFullTabWindowOpenTestUrl[] = |
| 1447 L"http://localhost:1337/files/chrome_frame_window_open.html"; | 1440 L"http://localhost:1337/files/chrome_frame_window_open.html"; |
| 1448 | 1441 |
| 1449 const wchar_t kChromeFrameFullTabWindowOpenPopupUrl[] = | 1442 const wchar_t kChromeFrameFullTabWindowOpenPopupUrl[] = |
| 1450 L"http://localhost:1337/files/chrome_frame_window_open_popup.html"; | 1443 L"http://localhost:1337/files/chrome_frame_window_open_popup.html"; |
| 1451 | 1444 |
| 1452 // This test checks if window.open calls issued by a full tab mode ChromeFrame | 1445 // This test checks if window.open calls issued by a full tab mode ChromeFrame |
| 1453 // instance make it back to IE and then transitions back to Chrome as the | 1446 // instance make it back to IE and then transitions back to Chrome as the |
| 1454 // window.open target page is supposed to render within Chrome. | 1447 // window.open target page is supposed to render within Chrome. |
| 1455 TEST_F(ChromeFrameTestWithWebServer, FullTabModeIE_WindowOpen) { | 1448 TEST_F(ChromeFrameTestWithWebServer, DISABLED_FullTabModeIE_WindowOpen) { |
| 1456 TimedMsgLoop loop; | 1449 TimedMsgLoop loop; |
| 1457 CComObjectStackEx<MockWebBrowserEventSink> mock; | 1450 CComObjectStackEx<MockWebBrowserEventSink> mock; |
| 1458 | 1451 |
| 1459 ::testing::InSequence sequence; | 1452 ::testing::InSequence sequence; |
| 1460 EXPECT_CALL(mock, | 1453 EXPECT_CALL(mock, |
| 1461 OnBeforeNavigate2( | 1454 OnBeforeNavigate2( |
| 1462 _, testing::Field(&VARIANT::bstrVal, | 1455 _, testing::Field(&VARIANT::bstrVal, |
| 1463 testing::StrCaseEq(kChromeFrameFullTabWindowOpenTestUrl)), | 1456 testing::StrCaseEq(kChromeFrameFullTabWindowOpenTestUrl)), |
| 1464 _, _, _, _, _)) | 1457 _, _, _, _, _)) |
| 1465 .WillOnce(testing::Return(S_OK)); | 1458 .WillOnce(testing::Return(S_OK)); |
| (...skipping 383 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1849 QUIT_LOOP_SOON(loop, 2))); | 1842 QUIT_LOOP_SOON(loop, 2))); |
| 1850 | 1843 |
| 1851 HRESULT hr = mock.LaunchIEAndNavigate(kAnchorUrl); | 1844 HRESULT hr = mock.LaunchIEAndNavigate(kAnchorUrl); |
| 1852 ASSERT_HRESULT_SUCCEEDED(hr); | 1845 ASSERT_HRESULT_SUCCEEDED(hr); |
| 1853 if (hr == S_FALSE) | 1846 if (hr == S_FALSE) |
| 1854 return; | 1847 return; |
| 1855 | 1848 |
| 1856 ASSERT_TRUE(mock.web_browser2() != NULL); | 1849 ASSERT_TRUE(mock.web_browser2() != NULL); |
| 1857 loop.RunFor(kChromeFrameLongNavigationTimeoutInSeconds); | 1850 loop.RunFor(kChromeFrameLongNavigationTimeoutInSeconds); |
| 1858 } | 1851 } |
| OLD | NEW |