| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 | 4 |
| 5 #include "chrome_frame/test/test_with_web_server.h" | 5 #include "chrome_frame/test/test_with_web_server.h" |
| 6 | 6 |
| 7 #include "base/base_paths.h" | 7 #include "base/base_paths.h" |
| 8 #include "base/file_version_info.h" | 8 #include "base/file_version_info.h" |
| 9 #include "base/path_service.h" | 9 #include "base/path_service.h" |
| 10 #include "base/utf_string_conversions.h" | 10 #include "base/utf_string_conversions.h" |
| (...skipping 753 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 764 SimpleBrowserTest(IE, kCFProtocolPage, L"chrome_frame_protocol"); | 764 SimpleBrowserTest(IE, kCFProtocolPage, L"chrome_frame_protocol"); |
| 765 SetConfigBool(kAllowUnsafeURLs, false); | 765 SetConfigBool(kAllowUnsafeURLs, false); |
| 766 } | 766 } |
| 767 | 767 |
| 768 const wchar_t kPersistentCookieTest[] = | 768 const wchar_t kPersistentCookieTest[] = |
| 769 L"files/persistent_cookie_test_page.html"; | 769 L"files/persistent_cookie_test_page.html"; |
| 770 TEST_F(ChromeFrameTestWithWebServer, FullTabModeIE_PersistentCookieTest) { | 770 TEST_F(ChromeFrameTestWithWebServer, FullTabModeIE_PersistentCookieTest) { |
| 771 SimpleBrowserTest(IE, kPersistentCookieTest, L"PersistentCookieTest"); | 771 SimpleBrowserTest(IE, kPersistentCookieTest, L"PersistentCookieTest"); |
| 772 } | 772 } |
| 773 | 773 |
| 774 // This test has been disabled because we need a better way to navigate out |
| 775 // of chrome frame and detect it. |
| 774 const wchar_t kNavigateOutPage[] = L"files/navigate_out.html"; | 776 const wchar_t kNavigateOutPage[] = L"files/navigate_out.html"; |
| 775 TEST_F(ChromeFrameTestWithWebServer, FullTabModeIE_NavigateOut) { | 777 TEST_F(ChromeFrameTestWithWebServer, DISABLED_FullTabModeIE_NavigateOut) { |
| 776 SimpleBrowserTest(IE, kNavigateOutPage, L"navigate_out"); | 778 SimpleBrowserTest(IE, kNavigateOutPage, L"navigate_out"); |
| 777 } | 779 } |
| 778 | 780 |
| 779 const wchar_t kReferrerMainTest[] = L"files/referrer_main.html"; | 781 const wchar_t kReferrerMainTest[] = L"files/referrer_main.html"; |
| 780 | 782 |
| 781 TEST_F(ChromeFrameTestWithWebServer, FullTabModeIE_ReferrerTest) { | 783 TEST_F(ChromeFrameTestWithWebServer, FullTabModeIE_ReferrerTest) { |
| 782 SimpleBrowserTest(IE, kReferrerMainTest, L"FullTab_ReferrerTest"); | 784 SimpleBrowserTest(IE, kReferrerMainTest, L"FullTab_ReferrerTest"); |
| 783 } | 785 } |
| 784 | 786 |
| 785 const wchar_t kSubFrameTestPage[] = L"files/full_tab_sub_frame_main.html"; | 787 const wchar_t kSubFrameTestPage[] = L"files/full_tab_sub_frame_main.html"; |
| (...skipping 199 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 985 chrome_frame_test::TimedMsgLoop loop; | 987 chrome_frame_test::TimedMsgLoop loop; |
| 986 ASSERT_TRUE(LaunchBrowser(IE, kXHRConditionalHeaderTestUrl)); | 988 ASSERT_TRUE(LaunchBrowser(IE, kXHRConditionalHeaderTestUrl)); |
| 987 | 989 |
| 988 loop.RunFor(kChromeFrameLongNavigationTimeoutInSeconds); | 990 loop.RunFor(kChromeFrameLongNavigationTimeoutInSeconds); |
| 989 | 991 |
| 990 chrome_frame_test::CloseAllIEWindows(); | 992 chrome_frame_test::CloseAllIEWindows(); |
| 991 ASSERT_TRUE(CheckResultFile(L"FullTab_XMLHttpRequestConditionalHeaderTest", | 993 ASSERT_TRUE(CheckResultFile(L"FullTab_XMLHttpRequestConditionalHeaderTest", |
| 992 "OK")); | 994 "OK")); |
| 993 } | 995 } |
| 994 | 996 |
| OLD | NEW |