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

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

Issue 10821104: Support GrabWindowSnapshot with no g_browser_process (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Rebased Created 8 years, 4 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
« no previous file with comments | « chrome/test/base/ui_test_utils_win.cc ('k') | ui/ui.gyp » ('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) 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 679 matching lines...) Expand 10 before | Expand all | Expand 10 after
690 const wchar_t kXMLHttpRequestTestUrl[] = 690 const wchar_t kXMLHttpRequestTestUrl[] =
691 L"xmlhttprequest_test.html"; 691 L"xmlhttprequest_test.html";
692 692
693 TEST_F(ChromeFrameTestWithWebServer, FullTabModeIE_XHRTest) { 693 TEST_F(ChromeFrameTestWithWebServer, FullTabModeIE_XHRTest) {
694 SimpleBrowserTest(IE, kXMLHttpRequestTestUrl); 694 SimpleBrowserTest(IE, kXMLHttpRequestTestUrl);
695 } 695 }
696 696
697 const wchar_t kInstallFlowTestUrl[] = 697 const wchar_t kInstallFlowTestUrl[] =
698 L"install_flow_test.html"; 698 L"install_flow_test.html";
699 699
700 // crbug.com/139694 700 TEST_F(ChromeFrameTestWithWebServer, FullTabModeIE_InstallFlowTest) {
701 TEST_F(ChromeFrameTestWithWebServer, DISABLED_FullTabModeIE_InstallFlowTest) {
702 if (base::win::GetVersion() < base::win::VERSION_VISTA) { 701 if (base::win::GetVersion() < base::win::VERSION_VISTA) {
703 ScopedChromeFrameRegistrar::UnregisterAtPath( 702 ScopedChromeFrameRegistrar::UnregisterAtPath(
704 GetChromeFrameBuildPath().value(), 703 GetChromeFrameBuildPath().value(),
705 chrome_frame_test::GetTestBedType()); 704 chrome_frame_test::GetTestBedType());
706 705
707 ASSERT_TRUE(LaunchBrowser(IE, kInstallFlowTestUrl)); 706 ASSERT_TRUE(LaunchBrowser(IE, kInstallFlowTestUrl));
708 707
709 loop().RunFor(kChromeFrameLongNavigationTimeout); 708 loop().RunFor(kChromeFrameLongNavigationTimeout);
710 709
711 ScopedChromeFrameRegistrar::RegisterAtPath( 710 ScopedChromeFrameRegistrar::RegisterAtPath(
(...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after
895 mutable int request_id_; 894 mutable int request_id_;
896 }; 895 };
897 896
898 // This test simulates a URL that on first request returns a document 897 // This test simulates a URL that on first request returns a document
899 // that should be rendered in mshtml, then pops up a sign-in page that 898 // that should be rendered in mshtml, then pops up a sign-in page that
900 // after signing in, refreshes the original page that should then return 899 // after signing in, refreshes the original page that should then return
901 // a page that needs to be rendered in GCF. 900 // a page that needs to be rendered in GCF.
902 // 901 //
903 // This test currently fails because GCF does not add the chromeframe header 902 // This test currently fails because GCF does not add the chromeframe header
904 // to requests that mshtml initiates via IInternetSession::CreateBinding. 903 // to requests that mshtml initiates via IInternetSession::CreateBinding.
905 // crbug.com/139694 904 TEST_F(ChromeFrameTestWithWebServer, FAILS_FullTabModeIE_RefreshMshtmlTest) {
906 TEST_F(ChromeFrameTestWithWebServer, DISABLED_FullTabModeIE_RefreshMshtmlTest) {
907 const wchar_t* kPages[] = { 905 const wchar_t* kPages[] = {
908 L"mshtml_refresh_test.html", 906 L"mshtml_refresh_test.html",
909 L"mshtml_refresh_test_popup.html", 907 L"mshtml_refresh_test_popup.html",
910 }; 908 };
911 909
912 SimpleWebServerTest server(46664); 910 SimpleWebServerTest server(46664);
913 server.PopulateStaticFileListT<UaTemplateFileResponse>(kPages, 911 server.PopulateStaticFileListT<UaTemplateFileResponse>(kPages,
914 arraysize(kPages), GetCFTestFilePath()); 912 arraysize(kPages), GetCFTestFilePath());
915 913
916 ASSERT_TRUE(LaunchBrowser(IE, server.FormatHttpPath(kPages[0]).c_str())); 914 ASSERT_TRUE(LaunchBrowser(IE, server.FormatHttpPath(kPages[0]).c_str()));
(...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after
1054 server.web_server()->AddResponse(response); 1052 server.web_server()->AddResponse(response);
1055 1053
1056 std::wstring url(server.FormatHttpPath(L"form.html")); 1054 std::wstring url(server.FormatHttpPath(L"form.html"));
1057 1055
1058 ASSERT_TRUE(LaunchBrowser(IE, url.c_str())); 1056 ASSERT_TRUE(LaunchBrowser(IE, url.c_str()));
1059 loop().RunFor(kChromeFrameLongNavigationTimeout); 1057 loop().RunFor(kChromeFrameLongNavigationTimeout);
1060 1058
1061 EXPECT_EQ(1, response->get_request_count()); 1059 EXPECT_EQ(1, response->get_request_count());
1062 EXPECT_EQ(1, response->post_request_count()); 1060 EXPECT_EQ(1, response->post_request_count());
1063 } 1061 }
OLDNEW
« no previous file with comments | « chrome/test/base/ui_test_utils_win.cc ('k') | ui/ui.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698