Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(50)

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

Issue 11411359: Fix typo so that ChromeFrameTestWithWebServer.FullTabModeIE_SubFrame is actually disabled. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years 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 | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/files/scoped_temp_dir.h" 9 #include "base/files/scoped_temp_dir.h"
10 #include "base/path_service.h" 10 #include "base/path_service.h"
(...skipping 673 matching lines...) Expand 10 before | Expand all | Expand 10 after
684 } 684 }
685 685
686 const wchar_t kReferrerMainTest[] = L"referrer_main.html"; 686 const wchar_t kReferrerMainTest[] = L"referrer_main.html";
687 687
688 TEST_F(ChromeFrameTestWithWebServer, FullTabModeIE_ReferrerTest) { 688 TEST_F(ChromeFrameTestWithWebServer, FullTabModeIE_ReferrerTest) {
689 SimpleBrowserTest(IE, kReferrerMainTest); 689 SimpleBrowserTest(IE, kReferrerMainTest);
690 } 690 }
691 691
692 // Times out: http://crbug.com/163728 692 // Times out: http://crbug.com/163728
693 const wchar_t kSubFrameTestPage[] = L"full_tab_sub_frame_main.html"; 693 const wchar_t kSubFrameTestPage[] = L"full_tab_sub_frame_main.html";
694 TEST_F(ChromeFrameTestWithWebServer, DISALBED_FullTabModeIE_SubFrame) { 694 TEST_F(ChromeFrameTestWithWebServer, DISABLED_FullTabModeIE_SubFrame) {
695 SimpleBrowserTest(IE, kSubFrameTestPage); 695 SimpleBrowserTest(IE, kSubFrameTestPage);
696 } 696 }
697 697
698 const wchar_t kSubIFrameTestPage[] = L"full_tab_sub_iframe_main.html"; 698 const wchar_t kSubIFrameTestPage[] = L"full_tab_sub_iframe_main.html";
699 TEST_F(ChromeFrameTestWithWebServer, FullTabModeIE_SubIFrame) { 699 TEST_F(ChromeFrameTestWithWebServer, FullTabModeIE_SubIFrame) {
700 SimpleBrowserTest(IE, kSubIFrameTestPage); 700 SimpleBrowserTest(IE, kSubIFrameTestPage);
701 } 701 }
702 702
703 const wchar_t kXMLHttpRequestTestUrl[] = 703 const wchar_t kXMLHttpRequestTestUrl[] =
704 L"xmlhttprequest_test.html"; 704 L"xmlhttprequest_test.html";
(...skipping 363 matching lines...) Expand 10 before | Expand all | Expand 10 after
1068 server.web_server()->AddResponse(response); 1068 server.web_server()->AddResponse(response);
1069 1069
1070 std::wstring url(server.FormatHttpPath(L"form.html")); 1070 std::wstring url(server.FormatHttpPath(L"form.html"));
1071 1071
1072 ASSERT_TRUE(LaunchBrowser(IE, url.c_str())); 1072 ASSERT_TRUE(LaunchBrowser(IE, url.c_str()));
1073 loop().RunFor(kChromeFrameLongNavigationTimeout); 1073 loop().RunFor(kChromeFrameLongNavigationTimeout);
1074 1074
1075 EXPECT_EQ(1, response->get_request_count()); 1075 EXPECT_EQ(1, response->get_request_count());
1076 EXPECT_EQ(1, response->post_request_count()); 1076 EXPECT_EQ(1, response->post_request_count());
1077 } 1077 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698