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

Side by Side Diff: chrome/browser/prerender/prerender_browsertest.cc

Issue 26622003: linux_aura: Turn it on again. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase to ToT and test against the recently committed nacl patch. Created 7 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
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 <deque> 5 #include <deque>
6 #include <vector> 6 #include <vector>
7 7
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/files/file_path.h" 10 #include "base/files/file_path.h"
(...skipping 2436 matching lines...) Expand 10 before | Expand all | Expand 10 after
2447 // Checks that if a page is opened due to click on a href with target="_blank" 2447 // Checks that if a page is opened due to click on a href with target="_blank"
2448 // and both pages are in the same domain the prerendered page is not used. 2448 // and both pages are in the same domain the prerendered page is not used.
2449 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, 2449 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest,
2450 PrerenderSameDomainWindowOpenerClickTarget) { 2450 PrerenderSameDomainWindowOpenerClickTarget) {
2451 PrerenderTestURL("files/prerender/prerender_page.html", 2451 PrerenderTestURL("files/prerender/prerender_page.html",
2452 FINAL_STATUS_APP_TERMINATING, 2452 FINAL_STATUS_APP_TERMINATING,
2453 1); 2453 1);
2454 OpenDestURLViaClickTarget(); 2454 OpenDestURLViaClickTarget();
2455 } 2455 }
2456 2456
2457 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(USE_AURA)
2458 // TODO(erg): linux_aura bringup: http://crbug.com/163931
2459 #define MAYBE_PrerenderSSLClientCertTopLevel DISABLED_PrerenderSSLClientCertTopL evel
2460 #else
2461 #define MAYBE_PrerenderSSLClientCertTopLevel PrerenderSSLClientCertTopLevel
2462 #endif
2463
2457 // Checks that a top-level page which would normally request an SSL client 2464 // Checks that a top-level page which would normally request an SSL client
2458 // certificate will never be seen since it's an https top-level resource. 2465 // certificate will never be seen since it's an https top-level resource.
2459 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderSSLClientCertTopLevel) { 2466 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest,
2467 MAYBE_PrerenderSSLClientCertTopLevel) {
2460 net::SpawnedTestServer::SSLOptions ssl_options; 2468 net::SpawnedTestServer::SSLOptions ssl_options;
2461 ssl_options.request_client_certificate = true; 2469 ssl_options.request_client_certificate = true;
2462 net::SpawnedTestServer https_server( 2470 net::SpawnedTestServer https_server(
2463 net::SpawnedTestServer::TYPE_HTTPS, ssl_options, 2471 net::SpawnedTestServer::TYPE_HTTPS, ssl_options,
2464 base::FilePath(FILE_PATH_LITERAL("chrome/test/data"))); 2472 base::FilePath(FILE_PATH_LITERAL("chrome/test/data")));
2465 ASSERT_TRUE(https_server.Start()); 2473 ASSERT_TRUE(https_server.Start());
2466 GURL https_url = https_server.GetURL("files/prerender/prerender_page.html"); 2474 GURL https_url = https_server.GetURL("files/prerender/prerender_page.html");
2467 PrerenderTestURL(https_url, FINAL_STATUS_SSL_CLIENT_CERTIFICATE_REQUESTED, 0); 2475 PrerenderTestURL(https_url, FINAL_STATUS_SSL_CLIENT_CERTIFICATE_REQUESTED, 0);
2468 } 2476 }
2469 2477
(...skipping 801 matching lines...) Expand 10 before | Expand all | Expand 10 after
3271 std::string post_data = "DATA"; 3279 std::string post_data = "DATA";
3272 content::OpenURLParams params(dest_url(), Referrer(), CURRENT_TAB, 3280 content::OpenURLParams params(dest_url(), Referrer(), CURRENT_TAB,
3273 content::PAGE_TRANSITION_TYPED, false); 3281 content::PAGE_TRANSITION_TYPED, false);
3274 params.uses_post = true; 3282 params.uses_post = true;
3275 params.browser_initiated_post_data = 3283 params.browser_initiated_post_data =
3276 base::RefCountedString::TakeString(&post_data); 3284 base::RefCountedString::TakeString(&post_data);
3277 NavigateToURLWithParams(params, false); 3285 NavigateToURLWithParams(params, false);
3278 } 3286 }
3279 3287
3280 } // namespace prerender 3288 } // namespace prerender
OLDNEW
« no previous file with comments | « chrome/browser/locale_tests_browsertest.cc ('k') | chrome/browser/sync/test/integration/two_client_themes_sync_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698