| 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/file_version_info.h" | 7 #include "base/file_version_info.h" |
| 8 #include "base/utf_string_conversions.h" | 8 #include "base/utf_string_conversions.h" |
| 9 #include "base/win_util.h" | 9 #include "base/win_util.h" |
| 10 #include "chrome/common/chrome_switches.h" | 10 #include "chrome/common/chrome_switches.h" |
| (...skipping 754 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 765 TEST_F(ChromeFrameTestWithWebServer, FullTabModeIE_CFProtocol) { | 765 TEST_F(ChromeFrameTestWithWebServer, FullTabModeIE_CFProtocol) { |
| 766 // Temporarily enable gcf: protocol for this test. | 766 // Temporarily enable gcf: protocol for this test. |
| 767 SetConfigBool(kEnableGCFProtocol, true); | 767 SetConfigBool(kEnableGCFProtocol, true); |
| 768 SimpleBrowserTest(IE, kCFProtocolPage, L"chrome_frame_protocol"); | 768 SimpleBrowserTest(IE, kCFProtocolPage, L"chrome_frame_protocol"); |
| 769 SetConfigBool(kEnableGCFProtocol, false); | 769 SetConfigBool(kEnableGCFProtocol, false); |
| 770 } | 770 } |
| 771 | 771 |
| 772 const wchar_t kPersistentCookieTest[] = | 772 const wchar_t kPersistentCookieTest[] = |
| 773 L"files/persistent_cookie_test_page.html"; | 773 L"files/persistent_cookie_test_page.html"; |
| 774 TEST_F(ChromeFrameTestWithWebServer, FullTabModeIE_PersistentCookieTest) { | 774 TEST_F(ChromeFrameTestWithWebServer, FullTabModeIE_PersistentCookieTest) { |
| 775 // Temporarily enable gcf: protocol for this test. | |
| 776 SetConfigBool(kEnableGCFProtocol, true); | |
| 777 SimpleBrowserTest(IE, kPersistentCookieTest, L"PersistentCookieTest"); | 775 SimpleBrowserTest(IE, kPersistentCookieTest, L"PersistentCookieTest"); |
| 778 SetConfigBool(kEnableGCFProtocol, false); | |
| 779 } | 776 } |
| 780 | 777 |
| 781 const wchar_t kNavigateOutPage[] = L"files/navigate_out.html"; | 778 const wchar_t kNavigateOutPage[] = L"files/navigate_out.html"; |
| 782 TEST_F(ChromeFrameTestWithWebServer, FullTabModeIE_NavigateOut) { | 779 TEST_F(ChromeFrameTestWithWebServer, FullTabModeIE_NavigateOut) { |
| 783 SimpleBrowserTest(IE, kNavigateOutPage, L"navigate_out"); | 780 SimpleBrowserTest(IE, kNavigateOutPage, L"navigate_out"); |
| 784 } | 781 } |
| 785 | 782 |
| 786 const wchar_t kReferrerMainTest[] = L"files/referrer_main.html"; | 783 const wchar_t kReferrerMainTest[] = L"files/referrer_main.html"; |
| 787 | 784 |
| 788 TEST_F(ChromeFrameTestWithWebServer, FullTabModeIE_ReferrerTest) { | 785 TEST_F(ChromeFrameTestWithWebServer, FullTabModeIE_ReferrerTest) { |
| (...skipping 203 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 992 chrome_frame_test::TimedMsgLoop loop; | 989 chrome_frame_test::TimedMsgLoop loop; |
| 993 ASSERT_TRUE(LaunchBrowser(IE, kXHRConditionalHeaderTestUrl)); | 990 ASSERT_TRUE(LaunchBrowser(IE, kXHRConditionalHeaderTestUrl)); |
| 994 | 991 |
| 995 loop.RunFor(kChromeFrameLongNavigationTimeoutInSeconds); | 992 loop.RunFor(kChromeFrameLongNavigationTimeoutInSeconds); |
| 996 | 993 |
| 997 chrome_frame_test::CloseAllIEWindows(); | 994 chrome_frame_test::CloseAllIEWindows(); |
| 998 ASSERT_TRUE(CheckResultFile(L"FullTab_XMLHttpRequestConditionalHeaderTest", | 995 ASSERT_TRUE(CheckResultFile(L"FullTab_XMLHttpRequestConditionalHeaderTest", |
| 999 "OK")); | 996 "OK")); |
| 1000 } | 997 } |
| 1001 | 998 |
| OLD | NEW |