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/stringprintf.h" | 10 #include "base/stringprintf.h" |
(...skipping 986 matching lines...) Loading... |
997 const wchar_t kXHRConditionalHeaderTestUrl[] = | 997 const wchar_t kXHRConditionalHeaderTestUrl[] = |
998 L"xmlhttprequest_conditional_header_test.html"; | 998 L"xmlhttprequest_conditional_header_test.html"; |
999 | 999 |
1000 TEST_F(ChromeFrameTestWithWebServer, FullTabModeIE_XHRConditionalHeaderTest) { | 1000 TEST_F(ChromeFrameTestWithWebServer, FullTabModeIE_XHRConditionalHeaderTest) { |
1001 SimpleBrowserTest(IE, kXHRConditionalHeaderTestUrl); | 1001 SimpleBrowserTest(IE, kXHRConditionalHeaderTestUrl); |
1002 } | 1002 } |
1003 | 1003 |
1004 const wchar_t kWindowCloseTestUrl[] = | 1004 const wchar_t kWindowCloseTestUrl[] = |
1005 L"window_close.html"; | 1005 L"window_close.html"; |
1006 | 1006 |
1007 // This test causes IE to display an infobar on IE7 and IE8 on Vista and | 1007 TEST_F(ChromeFrameTestWithWebServer, FullTabModeIE_WindowClose) { |
1008 // Windows 7 at least which causes this test to fail. Disabling it for | |
1009 // now. | |
1010 // http://code.google.com/p/chromium/issues/detail?id=61011 | |
1011 TEST_F(ChromeFrameTestWithWebServer, DISABLED_FullTabModeIE_WindowClose) { | |
1012 SimpleBrowserTest(IE, kWindowCloseTestUrl); | 1008 SimpleBrowserTest(IE, kWindowCloseTestUrl); |
1013 } | 1009 } |
1014 | 1010 |
1015 TEST_F(ChromeFrameTestWithWebServer, FullTabModeFF_WindowClose) { | 1011 TEST_F(ChromeFrameTestWithWebServer, FullTabModeFF_WindowClose) { |
1016 // Please see http://code.google.com/p/chromium/issues/detail?id=60987 | 1012 // Please see http://code.google.com/p/chromium/issues/detail?id=60987 |
1017 // for more information on why this test is disabled for Vista with IE7. | 1013 // for more information on why this test is disabled for Vista with IE7. |
1018 if (base::win::GetVersion() == base::win::VERSION_VISTA && | 1014 if (base::win::GetVersion() == base::win::VERSION_VISTA && |
1019 chrome_frame_test::GetInstalledIEVersion() == IE_7) { | 1015 chrome_frame_test::GetInstalledIEVersion() == IE_7) { |
1020 LOG(INFO) << "Not running test on Vista with IE7"; | 1016 LOG(INFO) << "Not running test on Vista with IE7"; |
1021 return; | 1017 return; |
(...skipping 218 matching lines...) Loading... |
1240 | 1236 |
1241 std::wstring url(server.FormatHttpPath(L"form.html")); | 1237 std::wstring url(server.FormatHttpPath(L"form.html")); |
1242 | 1238 |
1243 ASSERT_TRUE(LaunchBrowser(IE, url.c_str())); | 1239 ASSERT_TRUE(LaunchBrowser(IE, url.c_str())); |
1244 loop_.RunFor(kChromeFrameLongNavigationTimeoutInSeconds); | 1240 loop_.RunFor(kChromeFrameLongNavigationTimeoutInSeconds); |
1245 | 1241 |
1246 EXPECT_EQ(1, response->get_request_count()); | 1242 EXPECT_EQ(1, response->get_request_count()); |
1247 EXPECT_EQ(1, response->post_request_count()); | 1243 EXPECT_EQ(1, response->post_request_count()); |
1248 } | 1244 } |
1249 | 1245 |
OLD | NEW |