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

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

Issue 2620001: A new way of hooking internet protocols. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 10 years, 6 months 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/test_mock_with_web_server.cc ('k') | chrome_frame/utils.h » ('j') | 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) 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 #include "chrome_frame/test/test_with_web_server.h" 4 #include "chrome_frame/test/test_with_web_server.h"
5 5
6 #include "base/file_version_info.h" 6 #include "base/file_version_info.h"
7 #include "base/win_util.h" 7 #include "base/win_util.h"
8 #include "chrome/common/chrome_switches.h" 8 #include "chrome/common/chrome_switches.h"
9 #include "chrome/installer/util/install_util.h" 9 #include "chrome/installer/util/install_util.h"
10 #include "chrome/installer/util/helper.h" 10 #include "chrome/installer/util/helper.h"
(...skipping 781 matching lines...) Expand 10 before | Expand all | Expand 10 after
792 chrome_frame_test::CloseAllIEWindows(); 792 chrome_frame_test::CloseAllIEWindows();
793 ASSERT_TRUE(CheckResultFile(L"FullTab_DeleteCookieTest", "OK")); 793 ASSERT_TRUE(CheckResultFile(L"FullTab_DeleteCookieTest", "OK"));
794 } 794 }
795 795
796 const wchar_t kAnchorUrlNavigate[] = 796 const wchar_t kAnchorUrlNavigate[] =
797 L"files/fulltab_anchor_url_navigate.html#chrome_frame"; 797 L"files/fulltab_anchor_url_navigate.html#chrome_frame";
798 798
799 // http://code.google.com/p/chromium/issues/detail?id=35341 799 // http://code.google.com/p/chromium/issues/detail?id=35341
800 TEST_F(ChromeFrameTestWithWebServer, 800 TEST_F(ChromeFrameTestWithWebServer,
801 FLAKY_FullTabModeIE_AnchorUrlNavigateTest) { 801 FLAKY_FullTabModeIE_AnchorUrlNavigateTest) {
802 if (!MonikerPatchEnabled()) { 802 if (IsIBrowserServicePatchEnabled()) {
803 LOG(ERROR) << "Not running test. Moniker patch not enabled."; 803 LOG(ERROR) << "Not running test. IBrowserServicePatch is in place.";
804 return; 804 return;
805 } 805 }
806 806
807 chrome_frame_test::TimedMsgLoop loop; 807 chrome_frame_test::TimedMsgLoop loop;
808 ASSERT_TRUE(LaunchBrowser(IE, kAnchorUrlNavigate)); 808 ASSERT_TRUE(LaunchBrowser(IE, kAnchorUrlNavigate));
809 809
810 loop.RunFor(kChromeFrameLongNavigationTimeoutInSeconds); 810 loop.RunFor(kChromeFrameLongNavigationTimeoutInSeconds);
811 811
812 chrome_frame_test::CloseAllIEWindows(); 812 chrome_frame_test::CloseAllIEWindows();
813 ASSERT_TRUE(CheckResultFile(L"FullTab_AnchorURLNavigateTest", "OK")); 813 ASSERT_TRUE(CheckResultFile(L"FullTab_AnchorURLNavigateTest", "OK"));
814 } 814 }
815 815
816 // Test whether POST-ing a form from an mshtml page to a CF page will cause 816 // Test whether POST-ing a form from an mshtml page to a CF page will cause
817 // the request to get reissued. It should not. 817 // the request to get reissued. It should not.
818 TEST_F(ChromeFrameTestWithWebServer, FullTabModeIE_TestPostReissue) { 818 TEST_F(ChromeFrameTestWithWebServer, FullTabModeIE_TestPostReissue) {
819 if (!MonikerPatchEnabled()) { 819 if (IsIBrowserServicePatchEnabled()) {
820 LOG(ERROR) << "Not running test. Moniker patch not enabled."; 820 LOG(ERROR) << "Not running test. IBrowserServicePatch is in place.";
821 return; 821 return;
822 } 822 }
823 823
824 chrome_frame_test::TimedMsgLoop loop; // must come before the server. 824 chrome_frame_test::TimedMsgLoop loop; // must come before the server.
825 825
826 // The order of pages in this array is assumed to be mshtml, cf, script. 826 // The order of pages in this array is assumed to be mshtml, cf, script.
827 const wchar_t* kPages[] = { 827 const wchar_t* kPages[] = {
828 L"full_tab_post_mshtml.html", 828 L"full_tab_post_mshtml.html",
829 L"full_tab_post_target_cf.html", 829 L"full_tab_post_target_cf.html",
830 L"chrome_frame_tester_helpers.js", 830 L"chrome_frame_tester_helpers.js",
(...skipping 15 matching lines...) Expand all
846 // Check how many requests we got for the cf page. Also expect it to be 846 // Check how many requests we got for the cf page. Also expect it to be
847 // a POST. 847 // a POST.
848 int requests = server.GetRequestCountForPage(kPages[1], "POST"); 848 int requests = server.GetRequestCountForPage(kPages[1], "POST");
849 EXPECT_EQ(1, requests); 849 EXPECT_EQ(1, requests);
850 } 850 }
851 } 851 }
852 852
853 // Test whether following a link from an mshtml page to a CF page will cause 853 // Test whether following a link from an mshtml page to a CF page will cause
854 // multiple network requests. It should not. 854 // multiple network requests. It should not.
855 TEST_F(ChromeFrameTestWithWebServer, FullTabModeIE_TestMultipleGet) { 855 TEST_F(ChromeFrameTestWithWebServer, FullTabModeIE_TestMultipleGet) {
856 if (!MonikerPatchEnabled()) { 856 if (IsIBrowserServicePatchEnabled()) {
857 LOG(ERROR) << "Not running test. Moniker patch not enabled."; 857 LOG(ERROR) << "Not running test. IBrowserServicePatch is in place.";
858 return; 858 return;
859 } 859 }
860 860
861 chrome_frame_test::TimedMsgLoop loop; // must come before the server. 861 chrome_frame_test::TimedMsgLoop loop; // must come before the server.
862 862
863 // The order of pages in this array is assumed to be mshtml, cf, script. 863 // The order of pages in this array is assumed to be mshtml, cf, script.
864 const wchar_t* kPages[] = { 864 const wchar_t* kPages[] = {
865 L"full_tab_get_mshtml.html", 865 L"full_tab_get_mshtml.html",
866 L"full_tab_get_target_cf.html", 866 L"full_tab_get_target_cf.html",
867 L"chrome_frame_tester_helpers.js", 867 L"chrome_frame_tester_helpers.js",
(...skipping 26 matching lines...) Expand all
894 TEST_F(ChromeFrameTestWithWebServer, FullTabModeIE_SetCookieTest) { 894 TEST_F(ChromeFrameTestWithWebServer, FullTabModeIE_SetCookieTest) {
895 chrome_frame_test::TimedMsgLoop loop; 895 chrome_frame_test::TimedMsgLoop loop;
896 ASSERT_TRUE(LaunchBrowser(IE, kSetCookieTest)); 896 ASSERT_TRUE(LaunchBrowser(IE, kSetCookieTest));
897 897
898 loop.RunFor(kChromeFrameLongNavigationTimeoutInSeconds); 898 loop.RunFor(kChromeFrameLongNavigationTimeoutInSeconds);
899 899
900 chrome_frame_test::CloseAllIEWindows(); 900 chrome_frame_test::CloseAllIEWindows();
901 ASSERT_TRUE(CheckResultFile(L"FullTab_SetCookieTest", "OK")); 901 ASSERT_TRUE(CheckResultFile(L"FullTab_SetCookieTest", "OK"));
902 } 902 }
903 903
OLDNEW
« no previous file with comments | « chrome_frame/test/test_mock_with_web_server.cc ('k') | chrome_frame/utils.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698