OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 679 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
690 const wchar_t kXMLHttpRequestTestUrl[] = | 690 const wchar_t kXMLHttpRequestTestUrl[] = |
691 L"xmlhttprequest_test.html"; | 691 L"xmlhttprequest_test.html"; |
692 | 692 |
693 TEST_F(ChromeFrameTestWithWebServer, FullTabModeIE_XHRTest) { | 693 TEST_F(ChromeFrameTestWithWebServer, FullTabModeIE_XHRTest) { |
694 SimpleBrowserTest(IE, kXMLHttpRequestTestUrl); | 694 SimpleBrowserTest(IE, kXMLHttpRequestTestUrl); |
695 } | 695 } |
696 | 696 |
697 const wchar_t kInstallFlowTestUrl[] = | 697 const wchar_t kInstallFlowTestUrl[] = |
698 L"install_flow_test.html"; | 698 L"install_flow_test.html"; |
699 | 699 |
700 TEST_F(ChromeFrameTestWithWebServer, FullTabModeIE_InstallFlowTest) { | 700 // crbug.com/139694 |
| 701 TEST_F(ChromeFrameTestWithWebServer, DISABLED_FullTabModeIE_InstallFlowTest) { |
701 if (base::win::GetVersion() < base::win::VERSION_VISTA) { | 702 if (base::win::GetVersion() < base::win::VERSION_VISTA) { |
702 ScopedChromeFrameRegistrar::UnregisterAtPath( | 703 ScopedChromeFrameRegistrar::UnregisterAtPath( |
703 GetChromeFrameBuildPath().value(), | 704 GetChromeFrameBuildPath().value(), |
704 chrome_frame_test::GetTestBedType()); | 705 chrome_frame_test::GetTestBedType()); |
705 | 706 |
706 ASSERT_TRUE(LaunchBrowser(IE, kInstallFlowTestUrl)); | 707 ASSERT_TRUE(LaunchBrowser(IE, kInstallFlowTestUrl)); |
707 | 708 |
708 loop().RunFor(kChromeFrameLongNavigationTimeout); | 709 loop().RunFor(kChromeFrameLongNavigationTimeout); |
709 | 710 |
710 ScopedChromeFrameRegistrar::RegisterAtPath( | 711 ScopedChromeFrameRegistrar::RegisterAtPath( |
(...skipping 341 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1052 server.web_server()->AddResponse(response); | 1053 server.web_server()->AddResponse(response); |
1053 | 1054 |
1054 std::wstring url(server.FormatHttpPath(L"form.html")); | 1055 std::wstring url(server.FormatHttpPath(L"form.html")); |
1055 | 1056 |
1056 ASSERT_TRUE(LaunchBrowser(IE, url.c_str())); | 1057 ASSERT_TRUE(LaunchBrowser(IE, url.c_str())); |
1057 loop().RunFor(kChromeFrameLongNavigationTimeout); | 1058 loop().RunFor(kChromeFrameLongNavigationTimeout); |
1058 | 1059 |
1059 EXPECT_EQ(1, response->get_request_count()); | 1060 EXPECT_EQ(1, response->get_request_count()); |
1060 EXPECT_EQ(1, response->post_request_count()); | 1061 EXPECT_EQ(1, response->post_request_count()); |
1061 } | 1062 } |
OLD | NEW |