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

Unified Diff: net/websockets/websocket_end_to_end_test.cc

Issue 1003953008: Remove prerender cookie store, part 4. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@prerender-revert-cookie-store-3
Patch Set: rebase (just in case since this is so huge) Created 5 years, 9 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/url_request/url_request_unittest.cc ('k') | net/websockets/websocket_stream.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/websockets/websocket_end_to_end_test.cc
diff --git a/net/websockets/websocket_end_to_end_test.cc b/net/websockets/websocket_end_to_end_test.cc
index e652fe05408f6baef7eb81ea029219dee1ff01e4..e675d8b39512db7ec10dc2634d48212e63c88ecd 100644
--- a/net/websockets/websocket_end_to_end_test.cc
+++ b/net/websockets/websocket_end_to_end_test.cc
@@ -354,7 +354,7 @@ TEST_F(WebSocketEndToEndTest, DISABLED_ON_ANDROID(HttpsProxyUsed)) {
AuthCredentials(base::ASCIIToUTF16("foo"), base::ASCIIToUTF16("bar")));
{
scoped_ptr<URLRequest> request(
- context_.CreateRequest(http_page, DEFAULT_PRIORITY, &delegate, NULL));
+ context_.CreateRequest(http_page, DEFAULT_PRIORITY, &delegate));
request->Start();
// TestDelegate exits the message loop when the request completes by
// default.
@@ -400,7 +400,7 @@ TEST_F(WebSocketEndToEndTest, DISABLED_ON_ANDROID(HstsHttpsToWebSocket)) {
TestDelegate delegate;
GURL https_page = https_server.GetURL("files/hsts-headers.html");
scoped_ptr<URLRequest> request(
- context_.CreateRequest(https_page, DEFAULT_PRIORITY, &delegate, NULL));
+ context_.CreateRequest(https_page, DEFAULT_PRIORITY, &delegate));
request->Start();
// TestDelegate exits the message loop when the request completes.
base::RunLoop().Run();
@@ -433,7 +433,7 @@ TEST_F(WebSocketEndToEndTest, DISABLED_ON_ANDROID(HstsWebSocketToHttps)) {
GURL http_page =
ReplaceUrlScheme(https_server.GetURL("files/simple.html"), "http");
scoped_ptr<URLRequest> request(
- context_.CreateRequest(http_page, DEFAULT_PRIORITY, &delegate, NULL));
+ context_.CreateRequest(http_page, DEFAULT_PRIORITY, &delegate));
request->Start();
// TestDelegate exits the message loop when the request completes.
base::RunLoop().Run();
« no previous file with comments | « net/url_request/url_request_unittest.cc ('k') | net/websockets/websocket_stream.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698