| 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 887 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 898 mutable int request_id_; | 898 mutable int request_id_; |
| 899 }; | 899 }; |
| 900 | 900 |
| 901 // This test simulates a URL that on first request returns a document | 901 // This test simulates a URL that on first request returns a document |
| 902 // that should be rendered in mshtml, then pops up a sign-in page that | 902 // that should be rendered in mshtml, then pops up a sign-in page that |
| 903 // after signing in, refreshes the original page that should then return | 903 // after signing in, refreshes the original page that should then return |
| 904 // a page that needs to be rendered in GCF. | 904 // a page that needs to be rendered in GCF. |
| 905 // | 905 // |
| 906 // This test currently fails because GCF does not add the chromeframe header | 906 // This test currently fails because GCF does not add the chromeframe header |
| 907 // to requests that mshtml initiates via IInternetSession::CreateBinding. | 907 // to requests that mshtml initiates via IInternetSession::CreateBinding. |
| 908 TEST_F(ChromeFrameTestWithWebServer, FAILS_FullTabModeIE_RefreshMshtmlTest) { | 908 TEST_F(ChromeFrameTestWithWebServer, DISABLED_FullTabModeIE_RefreshMshtmlTest) { |
| 909 const wchar_t* kPages[] = { | 909 const wchar_t* kPages[] = { |
| 910 L"mshtml_refresh_test.html", | 910 L"mshtml_refresh_test.html", |
| 911 L"mshtml_refresh_test_popup.html", | 911 L"mshtml_refresh_test_popup.html", |
| 912 }; | 912 }; |
| 913 | 913 |
| 914 SimpleWebServerTest server(local_address_, 46664); | 914 SimpleWebServerTest server(local_address_, 46664); |
| 915 server.PopulateStaticFileListT<UaTemplateFileResponse>(kPages, | 915 server.PopulateStaticFileListT<UaTemplateFileResponse>(kPages, |
| 916 arraysize(kPages), GetCFTestFilePath()); | 916 arraysize(kPages), GetCFTestFilePath()); |
| 917 | 917 |
| 918 ASSERT_TRUE(LaunchBrowser(IE, server.FormatHttpPath(kPages[0]).c_str())); | 918 ASSERT_TRUE(LaunchBrowser(IE, server.FormatHttpPath(kPages[0]).c_str())); |
| (...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1056 server.web_server()->AddResponse(response); | 1056 server.web_server()->AddResponse(response); |
| 1057 | 1057 |
| 1058 std::wstring url(server.FormatHttpPath(L"form.html")); | 1058 std::wstring url(server.FormatHttpPath(L"form.html")); |
| 1059 | 1059 |
| 1060 ASSERT_TRUE(LaunchBrowser(IE, url.c_str())); | 1060 ASSERT_TRUE(LaunchBrowser(IE, url.c_str())); |
| 1061 loop().RunFor(kChromeFrameLongNavigationTimeout); | 1061 loop().RunFor(kChromeFrameLongNavigationTimeout); |
| 1062 | 1062 |
| 1063 EXPECT_EQ(1, response->get_request_count()); | 1063 EXPECT_EQ(1, response->get_request_count()); |
| 1064 EXPECT_EQ(1, response->post_request_count()); | 1064 EXPECT_EQ(1, response->post_request_count()); |
| 1065 } | 1065 } |
| OLD | NEW |