| 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 902 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 913 const wchar_t kDeleteCookieTest[] = | 913 const wchar_t kDeleteCookieTest[] = |
| 914 L"fulltab_delete_cookie_test.html"; | 914 L"fulltab_delete_cookie_test.html"; |
| 915 | 915 |
| 916 TEST_F(ChromeFrameTestWithWebServer, FullTabModeIE_DeleteCookieTest) { | 916 TEST_F(ChromeFrameTestWithWebServer, FullTabModeIE_DeleteCookieTest) { |
| 917 SimpleBrowserTest(IE, kDeleteCookieTest); | 917 SimpleBrowserTest(IE, kDeleteCookieTest); |
| 918 } | 918 } |
| 919 | 919 |
| 920 const wchar_t kAnchorUrlNavigate[] = | 920 const wchar_t kAnchorUrlNavigate[] = |
| 921 L"fulltab_anchor_url_navigate.html#chrome_frame"; | 921 L"fulltab_anchor_url_navigate.html#chrome_frame"; |
| 922 | 922 |
| 923 // http://code.google.com/p/chromium/issues/detail?id=35341 | 923 TEST_F(ChromeFrameTestWithWebServer, FullTabModeIE_AnchorUrlNavigateTest) { |
| 924 TEST_F(ChromeFrameTestWithWebServer, | |
| 925 FLAKY_FullTabModeIE_AnchorUrlNavigateTest) { | |
| 926 if (IsIBrowserServicePatchEnabled()) { | 924 if (IsIBrowserServicePatchEnabled()) { |
| 927 LOG(ERROR) << "Not running test. IBrowserServicePatch is in place."; | 925 LOG(ERROR) << "Not running test. IBrowserServicePatch is in place."; |
| 928 return; | 926 return; |
| 929 } | 927 } |
| 930 | 928 |
| 931 SimpleBrowserTest(IE, kAnchorUrlNavigate); | 929 SimpleBrowserTest(IE, kAnchorUrlNavigate); |
| 932 } | 930 } |
| 933 | 931 |
| 934 // Test whether POST-ing a form from an mshtml page to a CF page will cause | 932 // Test whether POST-ing a form from an mshtml page to a CF page will cause |
| 935 // the request to get reissued. It should not. | 933 // the request to get reissued. It should not. |
| (...skipping 325 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1261 | 1259 |
| 1262 std::wstring url(server.FormatHttpPath(L"form.html")); | 1260 std::wstring url(server.FormatHttpPath(L"form.html")); |
| 1263 | 1261 |
| 1264 ASSERT_TRUE(LaunchBrowser(IE, url.c_str())); | 1262 ASSERT_TRUE(LaunchBrowser(IE, url.c_str())); |
| 1265 loop_.RunFor(kChromeFrameLongNavigationTimeoutInSeconds); | 1263 loop_.RunFor(kChromeFrameLongNavigationTimeoutInSeconds); |
| 1266 | 1264 |
| 1267 EXPECT_EQ(1, response->get_request_count()); | 1265 EXPECT_EQ(1, response->get_request_count()); |
| 1268 EXPECT_EQ(1, response->post_request_count()); | 1266 EXPECT_EQ(1, response->post_request_count()); |
| 1269 } | 1267 } |
| 1270 | 1268 |
| OLD | NEW |