chrome_frame/test/test_with_web_server.cc - Issue 4983004: Fix more ChromeFrame tests so that they work on IE9.

Side by Side Diff: chrome_frame/test/test_with_web_server.cc

Issue 4983004: Fix more ChromeFrame tests so that they work on IE9. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 10 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « chrome_frame/test/navigation_test.cc ('k') | no next file » | no next file with comments »

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 1118 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1129 EXPECT_NE(std::string::npos, ua.find("chromeframe"));	1129 EXPECT_NE(std::string::npos, ua.find("chromeframe"));

1130 }	1130 }

1131 }	1131 }

1132 EXPECT_GT(requests_for_first_page, 1);	1132 EXPECT_GT(requests_for_first_page, 1);

1133 }	1133 }

1134	1134

1135 // See bug 36694 for details. http://crbug.com/36694	1135 // See bug 36694 for details. http://crbug.com/36694

1136 TEST_F(ChromeFrameTestWithWebServer, FullTabModeIE_TestDownloadFromForm) {	1136 TEST_F(ChromeFrameTestWithWebServer, FullTabModeIE_TestDownloadFromForm) {

1137 chrome_frame_test::MockWindowObserver win_observer_mock;	1137 chrome_frame_test::MockWindowObserver win_observer_mock;

1138 win_observer_mock.WatchWindow("File Download", "");	1138 win_observer_mock.WatchWindow("File Download", "");

	1139 win_observer_mock.WatchWindow("View Downloads*", "");

1139	1140

1140 // The content of our HTML test page. This will be returned whenever	1141 // The content of our HTML test page. This will be returned whenever

1141 // we reply to a GET request.	1142 // we reply to a GET request.

1142 static const char kHtml[] =	1143 static const char kHtml[] =

1143 "<html><head>\n"	1144 "<html><head>\n"

1144 "<title>ChromeFrame Form Download Test</title>\n"	1145 "<title>ChromeFrame Form Download Test</title>\n"

1145 // To see how this test runs with only IE (no CF in the picture), comment	1146 // To see how this test runs with only IE (no CF in the picture), comment

1146 // out this meta tag. The outcome of the test should be identical.	1147 // out this meta tag. The outcome of the test should be identical.

1147 "<meta http-equiv=\"X-UA-Compatible\" content=\"chrome=1\" />\n"	1148 "<meta http-equiv=\"X-UA-Compatible\" content=\"chrome=1\" />\n"

1148 "</head>\n"	1149 "</head>\n"

(...skipping 101 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1250	1251

1251 std::wstring url(server.FormatHttpPath(L"form.html"));	1252 std::wstring url(server.FormatHttpPath(L"form.html"));

1252	1253

1253 ASSERT_TRUE(LaunchBrowser(IE, url.c_str()));	1254 ASSERT_TRUE(LaunchBrowser(IE, url.c_str()));

1254 loop_.RunFor(kChromeFrameLongNavigationTimeoutInSeconds);	1255 loop_.RunFor(kChromeFrameLongNavigationTimeoutInSeconds);

1255	1256

1256 EXPECT_EQ(1, response->get_request_count());	1257 EXPECT_EQ(1, response->get_request_count());

1257 EXPECT_EQ(1, response->post_request_count());	1258 EXPECT_EQ(1, response->post_request_count());

1258 }	1259 }

1259	1260

OLD	NEW