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

Unified Diff: net/http/http_network_transaction_spdy3_unittest.cc

Issue 10546071: CapturingNetLog - remove maximum entries constructor argument. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: sync Created 8 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 side-by-side diff with in-line comments
Download patch
Index: net/http/http_network_transaction_spdy3_unittest.cc
===================================================================
--- net/http/http_network_transaction_spdy3_unittest.cc (revision 141266)
+++ net/http/http_network_transaction_spdy3_unittest.cc (working copy)
@@ -235,7 +235,7 @@
TestCompletionCallback callback;
- CapturingBoundNetLog log(CapturingNetLog::kUnbounded);
+ CapturingBoundNetLog log;
EXPECT_TRUE(log.bound().IsLoggingAllEvents());
int rv = trans->Start(&request, callback.callback(), log.bound());
EXPECT_EQ(ERR_IO_PENDING, rv);
@@ -259,7 +259,7 @@
rv = ReadTransaction(trans.get(), &out.response_data);
EXPECT_EQ(OK, rv);
- net::CapturingNetLog::CapturedEntryList entries;
+ CapturingNetLog::CapturedEntryList entries;
log.GetEntries(&entries);
size_t pos = ExpectLogContainsSomewhere(
entries, 0, NetLog::TYPE_HTTP_TRANSACTION_SEND_REQUEST_HEADERS,
@@ -1741,7 +1741,7 @@
// Configure against proxy server "myproxy:70".
SessionDependencies session_deps(ProxyService::CreateFixed("myproxy:70"));
- CapturingBoundNetLog log(CapturingNetLog::kUnbounded);
+ CapturingBoundNetLog log;
session_deps.net_log = log.bound().net_log();
scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps));
@@ -1794,7 +1794,7 @@
rv = callback1.WaitForResult();
EXPECT_EQ(OK, rv);
- net::CapturingNetLog::CapturedEntryList entries;
+ CapturingNetLog::CapturedEntryList entries;
log.GetEntries(&entries);
size_t pos = ExpectLogContainsSomewhere(
entries, 0, NetLog::TYPE_HTTP_TRANSACTION_SEND_TUNNEL_HEADERS,
@@ -1847,7 +1847,7 @@
// Configure against proxy server "myproxy:70".
SessionDependencies session_deps(ProxyService::CreateFixed("myproxy:70"));
- CapturingBoundNetLog log(CapturingNetLog::kUnbounded);
+ CapturingBoundNetLog log;
session_deps.net_log = log.bound().net_log();
scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps));
@@ -1895,7 +1895,7 @@
rv = callback1.WaitForResult();
EXPECT_EQ(OK, rv);
- net::CapturingNetLog::CapturedEntryList entries;
+ CapturingNetLog::CapturedEntryList entries;
log.GetEntries(&entries);
size_t pos = ExpectLogContainsSomewhere(
entries, 0, NetLog::TYPE_HTTP_TRANSACTION_SEND_TUNNEL_HEADERS,
@@ -2050,7 +2050,7 @@
request.url = GURL("https://www.google.com/");
SessionDependencies session_deps(ProxyService::CreateFixed("myproxy:70"));
- CapturingBoundNetLog log(CapturingNetLog::kUnbounded);
+ CapturingBoundNetLog log;
session_deps.net_log = log.bound().net_log();
scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps));
@@ -2089,7 +2089,7 @@
rv = callback1.WaitForResult();
EXPECT_EQ(ERR_UNEXPECTED_PROXY_AUTH, rv);
- net::CapturingNetLog::CapturedEntryList entries;
+ CapturingNetLog::CapturedEntryList entries;
log.GetEntries(&entries);
size_t pos = ExpectLogContainsSomewhere(
entries, 0, NetLog::TYPE_HTTP_TRANSACTION_SEND_TUNNEL_HEADERS,
@@ -2109,7 +2109,7 @@
// Configure against https proxy server "proxy:70".
SessionDependencies session_deps(ProxyService::CreateFixed(
"https://proxy:70"));
- CapturingBoundNetLog log(CapturingNetLog::kUnbounded);
+ CapturingBoundNetLog log;
session_deps.net_log = log.bound().net_log();
scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps));
@@ -2165,7 +2165,7 @@
// Configure against https proxy server "proxy:70".
SessionDependencies session_deps(ProxyService::CreateFixed(
"https://proxy:70"));
- CapturingBoundNetLog log(CapturingNetLog::kUnbounded);
+ CapturingBoundNetLog log;
session_deps.net_log = log.bound().net_log();
scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps));
@@ -2223,7 +2223,7 @@
// Configure against https proxy server "myproxy:70".
SessionDependencies session_deps(
ProxyService::CreateFixed("https://myproxy:70"));
- CapturingBoundNetLog log(CapturingNetLog::kUnbounded);
+ CapturingBoundNetLog log;
session_deps.net_log = log.bound().net_log();
scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps));
@@ -2323,7 +2323,7 @@
// Configure against https proxy server "proxy:70".
SessionDependencies session_deps(ProxyService::CreateFixed(
"https://proxy:70"));
- CapturingBoundNetLog log(CapturingNetLog::kUnbounded);
+ CapturingBoundNetLog log;
session_deps.net_log = log.bound().net_log();
scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps));
@@ -2404,7 +2404,7 @@
// Configure against https proxy server "proxy:70".
SessionDependencies session_deps(ProxyService::CreateFixed(
"https://proxy:70"));
- CapturingBoundNetLog log(CapturingNetLog::kUnbounded);
+ CapturingBoundNetLog log;
session_deps.net_log = log.bound().net_log();
scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps));
@@ -2483,7 +2483,7 @@
// Configure against https proxy server "proxy:70".
SessionDependencies session_deps(ProxyService::CreateFixed(
"https://proxy:70"));
- CapturingBoundNetLog log(CapturingNetLog::kUnbounded);
+ CapturingBoundNetLog log;
session_deps.net_log = log.bound().net_log();
scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps));
@@ -2542,7 +2542,7 @@
// Configure against https proxy server "myproxy:70".
SessionDependencies session_deps(
ProxyService::CreateFixed("https://myproxy:70"));
- CapturingBoundNetLog log(CapturingNetLog::kUnbounded);
+ CapturingBoundNetLog log;
session_deps.net_log = log.bound().net_log();
scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps));
@@ -4918,7 +4918,7 @@
// Configure against https proxy server "myproxy:70".
SessionDependencies session_deps(
ProxyService::CreateFixed("https://myproxy:70"));
- CapturingBoundNetLog log(CapturingNetLog::kUnbounded);
+ CapturingBoundNetLog log;
session_deps.net_log = log.bound().net_log();
scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps));
@@ -5004,7 +5004,7 @@
rv = callback1.WaitForResult();
EXPECT_EQ(OK, rv);
- net::CapturingNetLog::CapturedEntryList entries;
+ CapturingNetLog::CapturedEntryList entries;
log.GetEntries(&entries);
size_t pos = ExpectLogContainsSomewhere(
entries, 0, NetLog::TYPE_HTTP_TRANSACTION_SEND_TUNNEL_HEADERS,
@@ -5066,7 +5066,7 @@
// Configure against https proxy server "myproxy:70".
SessionDependencies session_deps(
ProxyService::CreateFixed("https://myproxy:70"));
- CapturingBoundNetLog log(CapturingNetLog::kUnbounded);
+ CapturingBoundNetLog log;
session_deps.net_log = log.bound().net_log();
// Enable cross-origin push.
@@ -5164,7 +5164,7 @@
// Configure against https proxy server "myproxy:70".
SessionDependencies session_deps(
ProxyService::CreateFixed("https://myproxy:70"));
- CapturingBoundNetLog log(CapturingNetLog::kUnbounded);
+ CapturingBoundNetLog log;
session_deps.net_log = log.bound().net_log();
// Enable cross-origin push.
@@ -8792,7 +8792,7 @@
TestCompletionCallback callback;
- CapturingBoundNetLog log(CapturingNetLog::kUnbounded);
+ CapturingBoundNetLog log;
int rv = trans->Start(&request, callback.callback(), log.bound());
EXPECT_EQ(ERR_IO_PENDING, rv);
trans.reset(); // Cancel the transaction here.
@@ -8803,7 +8803,7 @@
// Test a basic GET request through a proxy.
TEST_F(HttpNetworkTransactionSpdy3Test, ProxyGet) {
SessionDependencies session_deps(ProxyService::CreateFixed("myproxy:70"));
- CapturingBoundNetLog log(CapturingNetLog::kUnbounded);
+ CapturingBoundNetLog log;
session_deps.net_log = log.bound().net_log();
scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps));
@@ -8851,7 +8851,7 @@
// Test a basic HTTPS GET request through a proxy.
TEST_F(HttpNetworkTransactionSpdy3Test, ProxyTunnelGet) {
SessionDependencies session_deps(ProxyService::CreateFixed("myproxy:70"));
- CapturingBoundNetLog log(CapturingNetLog::kUnbounded);
+ CapturingBoundNetLog log;
session_deps.net_log = log.bound().net_log();
scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps));
@@ -8894,7 +8894,7 @@
rv = callback1.WaitForResult();
EXPECT_EQ(OK, rv);
- net::CapturingNetLog::CapturedEntryList entries;
+ CapturingNetLog::CapturedEntryList entries;
log.GetEntries(&entries);
size_t pos = ExpectLogContainsSomewhere(
entries, 0, NetLog::TYPE_HTTP_TRANSACTION_SEND_TUNNEL_HEADERS,
@@ -8918,7 +8918,7 @@
// while establishing the tunnel.
TEST_F(HttpNetworkTransactionSpdy3Test, ProxyTunnelGetHangup) {
SessionDependencies session_deps(ProxyService::CreateFixed("myproxy:70"));
- CapturingBoundNetLog log(CapturingNetLog::kUnbounded);
+ CapturingBoundNetLog log;
session_deps.net_log = log.bound().net_log();
scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps));
@@ -8958,7 +8958,7 @@
rv = callback1.WaitForResult();
EXPECT_EQ(ERR_EMPTY_RESPONSE, rv);
- net::CapturingNetLog::CapturedEntryList entries;
+ CapturingNetLog::CapturedEntryList entries;
log.GetEntries(&entries);
size_t pos = ExpectLogContainsSomewhere(
entries, 0, NetLog::TYPE_HTTP_TRANSACTION_SEND_TUNNEL_HEADERS,
@@ -9305,7 +9305,7 @@
TEST_F(HttpNetworkTransactionSpdy3Test, ClientAuthCertCache_Proxy_Fail) {
SessionDependencies session_deps(
ProxyService::CreateFixed("https://proxy:70"));
- CapturingBoundNetLog log(CapturingNetLog::kUnbounded);
+ CapturingBoundNetLog log;
session_deps.net_log = log.bound().net_log();
scoped_refptr<SSLCertRequestInfo> cert_request(new SSLCertRequestInfo());
« no previous file with comments | « net/http/http_network_transaction_spdy2_unittest.cc ('k') | net/proxy/multi_threaded_proxy_resolver_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698