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

Unified Diff: net/http/http_network_transaction_unittest.cc

Issue 848006: Generalize the net module's LoadLog facility from a passive container, to an event stream (NetLog). (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Split up RequestTracker into ConnectJobTracker+RequestTracker+RequestTrackerBase, address comments Created 10 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/http/http_network_transaction.cc ('k') | net/http/http_stream_parser.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/http/http_network_transaction_unittest.cc
===================================================================
--- net/http/http_network_transaction_unittest.cc (revision 41560)
+++ net/http/http_network_transaction_unittest.cc (working copy)
@@ -194,7 +194,7 @@
RequestPriority priority,
ClientSocketHandle* handle,
CompletionCallback* callback,
- LoadLog* load_log) {
+ const BoundNetLog& net_log) {
last_group_name_ = group_name;
return ERR_IO_PENDING;
}
@@ -4280,7 +4280,7 @@
int rv = trans->Start(&request, &callback, NULL);
EXPECT_EQ(ERR_IO_PENDING, rv);
-
+
HostPortPair http_host_port_pair;
http_host_port_pair.host = "www.google.com";
http_host_port_pair.port = 80;
@@ -4380,12 +4380,12 @@
// on the original port.
// TEST_F(HttpNetworkTransactionTest, UseAlternateProtocol) {
// SessionDependencies session_deps;
-//
+//
// HttpRequestInfo request;
// request.method = "GET";
// request.url = GURL("http://www.google.com/");
// request.load_flags = 0;
-//
+//
// MockRead data_reads[] = {
// MockRead("HTTP/1.1 200 OK\r\n\r\n"),
// MockRead("hello world"),
@@ -4393,14 +4393,14 @@
// };
// StaticSocketDataProvider data(data_reads, arraysize(data_reads), NULL, 0);
// session_deps.socket_factory.AddSocketDataProvider(&data);
-//
+//
// SSLSocketDataProvider ssl(true, OK);
// session_deps.socket_factory.AddSSLSocketDataProvider(&ssl);
-//
+//
// TestCompletionCallback callback;
-//
+//
// scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps));
-//
+//
// HostPortPair http_host_port_pair;
// http_host_port_pair.host = "www.google.com";
// http_host_port_pair.port = 80;
@@ -4409,18 +4409,18 @@
// alternate_protocols->SetAlternateProtocolFor(
// http_host_port_pair, 1234 /* port is ignored */,
// HttpAlternateProtocols::NPN_SPDY);
-//
+//
// scoped_ptr<HttpTransaction> trans(new HttpNetworkTransaction(session));
-//
+//
// int rv = trans->Start(&request, &callback, NULL);
// EXPECT_EQ(ERR_IO_PENDING, rv);
// EXPECT_EQ(OK, callback.WaitForResult());
-//
+//
// const HttpResponseInfo* response = trans->GetResponseInfo();
// ASSERT_TRUE(response != NULL);
// ASSERT_TRUE(response->headers != NULL);
// EXPECT_EQ("HTTP/1.1 200 OK", response->headers->GetStatusLine());
-//
+//
// std::string response_data;
// ASSERT_EQ(OK, ReadTransaction(trans.get(), &response_data));
// EXPECT_EQ("hello world", response_data);
« no previous file with comments | « net/http/http_network_transaction.cc ('k') | net/http/http_stream_parser.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698