From 333bdf6026b851956d493b551440e22f1bae7d71 Mon Sep 17 00:00:00 2001 From: "mmenke@chromium.org" Date: Fri, 8 Jun 2012 22:57:29 +0000 Subject: [PATCH] CapturingNetLog - remove maximum entries constructor argument. Also replace with a NULL NetLog in a couple callsites where it wasn't being used. R=eroman@chromium.org BUG=none Review URL: https://chromiumcodereview.appspot.com/10546071 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@141315 0039d316-1c4b-4281-b951-d872f2087c98 --- net/base/capturing_net_log.cc | 16 +++--- net/base/capturing_net_log.h | 10 +--- net/base/net_log_unittest.cc | 2 +- net/http/http_auth_handler_unittest.cc | 4 +- net/http/http_cache_unittest.cc | 6 +-- ...http_network_transaction_spdy2_unittest.cc | 38 +++++++------- ...http_network_transaction_spdy3_unittest.cc | 52 +++++++++---------- .../multi_threaded_proxy_resolver_unittest.cc | 16 +++--- .../proxy_resolver_js_bindings_unittest.cc | 10 ++-- net/proxy/proxy_resolver_v8_unittest.cc | 8 ++- net/proxy/proxy_script_decider_unittest.cc | 10 ++-- net/proxy/proxy_service_unittest.cc | 28 ++++------ .../client_socket_pool_base_unittest.cc | 34 ++++++------ net/socket/socks5_client_socket_unittest.cc | 11 ++-- net/socket/socks_client_socket_unittest.cc | 24 ++++----- net/socket/ssl_client_socket_unittest.cc | 16 +++--- .../transport_client_socket_unittest.cc | 1 - ...spdy_network_transaction_spdy2_unittest.cc | 2 +- ...spdy_network_transaction_spdy3_unittest.cc | 2 +- net/spdy/spdy_session_spdy2_unittest.cc | 2 +- net/spdy/spdy_session_spdy3_unittest.cc | 2 +- net/spdy/spdy_stream_spdy2_unittest.cc | 2 +- net/spdy/spdy_stream_spdy3_unittest.cc | 2 +- net/udp/udp_socket_unittest.cc | 4 +- 24 files changed, 141 insertions(+), 161 deletions(-) diff --git a/net/base/capturing_net_log.cc b/net/base/capturing_net_log.cc index 2ab0223ed2bc..0746d62deae6 100644 --- a/net/base/capturing_net_log.cc +++ b/net/base/capturing_net_log.cc @@ -58,9 +58,8 @@ bool CapturingNetLog::CapturedEntry::GetNetErrorCode(int* value) const { return GetIntegerValue("net_error", value); } -CapturingNetLog::CapturingNetLog(size_t max_num_entries) +CapturingNetLog::CapturingNetLog() : last_id_(0), - max_num_entries_(max_num_entries), log_level_(LOG_ALL_BUT_BYTES) { } @@ -86,10 +85,9 @@ void CapturingNetLog::AddEntry( const Source& source, EventPhase phase, const scoped_refptr& extra_parameters) { + // Only BoundNetLogs without a NetLog should have an invalid source. DCHECK(source.is_valid()); - base::AutoLock lock(lock_); - if (captured_entries_.size() >= max_num_entries_) - return; + // Using Dictionaries instead of Values makes checking values a little // simpler. DictionaryValue* param_dict = NULL; @@ -98,6 +96,9 @@ void CapturingNetLog::AddEntry( if (param_value && !param_value->GetAsDictionary(¶m_dict)) delete param_value; } + + // Only need to acquire the lock when accessing class variables. + base::AutoLock lock(lock_); captured_entries_.push_back( CapturedEntry(type, base::TimeTicks::Now(), @@ -131,9 +132,8 @@ void CapturingNetLog::RemoveThreadSafeObserver( NOTIMPLEMENTED() << "Not currently used by net unit tests."; } -CapturingBoundNetLog::CapturingBoundNetLog(size_t max_num_entries) - : capturing_net_log_(max_num_entries), - net_log_(BoundNetLog::Make(&capturing_net_log_, +CapturingBoundNetLog::CapturingBoundNetLog() + : net_log_(BoundNetLog::Make(&capturing_net_log_, net::NetLog::SOURCE_NONE)) { } diff --git a/net/base/capturing_net_log.h b/net/base/capturing_net_log.h index e3655d56b69c..fdc1349f8380 100644 --- a/net/base/capturing_net_log.h +++ b/net/base/capturing_net_log.h @@ -65,11 +65,7 @@ class CapturingNetLog : public NetLog { // Ordered set of entries that were logged. typedef std::vector CapturedEntryList; - enum { kUnbounded = -1 }; - - // Creates a CapturingNetLog that logs a maximum of |max_num_entries| - // messages. - explicit CapturingNetLog(size_t max_num_entries); + CapturingNetLog(); virtual ~CapturingNetLog(); // Returns the list of all entries in the log. @@ -100,7 +96,6 @@ class CapturingNetLog : public NetLog { // Last assigned source ID. Incremented to get the next one. base::subtle::Atomic32 last_id_; - size_t max_num_entries_; CapturedEntryList captured_entries_; NetLog::LogLevel log_level_; @@ -115,8 +110,7 @@ class CapturingNetLog : public NetLog { // bound() method. class CapturingBoundNetLog { public: - explicit CapturingBoundNetLog(size_t max_num_entries); - + CapturingBoundNetLog(); ~CapturingBoundNetLog(); // The returned BoundNetLog is only valid while |this| is alive. diff --git a/net/base/net_log_unittest.cc b/net/base/net_log_unittest.cc index 6471b2dece5f..3454df3f9127 100644 --- a/net/base/net_log_unittest.cc +++ b/net/base/net_log_unittest.cc @@ -13,7 +13,7 @@ namespace net { namespace { TEST(NetLog, ScopedNetLogEventTest) { - CapturingNetLog log(CapturingNetLog::kUnbounded); + CapturingNetLog log; BoundNetLog net_log(BoundNetLog::Make(&log, NetLog::SOURCE_URL_REQUEST)); scoped_ptr net_log_event( diff --git a/net/http/http_auth_handler_unittest.cc b/net/http/http_auth_handler_unittest.cc index ee0743796a2f..f079bab06046 100644 --- a/net/http/http_auth_handler_unittest.cc +++ b/net/http/http_auth_handler_unittest.cc @@ -36,7 +36,7 @@ TEST(HttpAuthHandlerTest, NetLog) { HttpAuth::ChallengeTokenizer tokenizer( challenge.begin(), challenge.end()); HttpAuthHandlerMock mock_handler; - CapturingNetLog capturing_net_log(CapturingNetLog::kUnbounded); + CapturingNetLog capturing_net_log; BoundNetLog bound_net_log(BoundNetLog::Make(&capturing_net_log, net::NetLog::SOURCE_NONE)); @@ -48,7 +48,7 @@ TEST(HttpAuthHandlerTest, NetLog) { if (async) test_callback.WaitForResult(); - net::CapturingNetLog::CapturedEntryList entries; + CapturingNetLog::CapturedEntryList entries; capturing_net_log.GetEntries(&entries); EXPECT_EQ(2u, entries.size()); diff --git a/net/http/http_cache_unittest.cc b/net/http/http_cache_unittest.cc index cd47a1ab5f13..90265999dfbe 100644 --- a/net/http/http_cache_unittest.cc +++ b/net/http/http_cache_unittest.cc @@ -427,7 +427,7 @@ TEST(HttpCache, SimpleGETNoDiskCache) { cache.disk_cache()->set_fail_requests(); - net::CapturingBoundNetLog log(net::CapturingNetLog::kUnbounded); + net::CapturingBoundNetLog log; log.SetLogLevel(net::NetLog::LOG_BASIC); // Read from the network, and don't use the cache. @@ -569,7 +569,7 @@ TEST(HttpCache, SimpleGETWithDiskFailures3) { TEST(HttpCache, SimpleGET_LoadOnlyFromCache_Hit) { MockHttpCache cache; - net::CapturingBoundNetLog log(net::CapturingNetLog::kUnbounded); + net::CapturingBoundNetLog log; // This prevents a number of write events from being logged. log.SetLogLevel(net::NetLog::LOG_BASIC); @@ -702,7 +702,7 @@ TEST(HttpCache, SimpleGET_LoadBypassCache) { MockTransaction transaction(kSimpleGET_Transaction); transaction.load_flags |= net::LOAD_BYPASS_CACHE; - net::CapturingBoundNetLog log(net::CapturingNetLog::kUnbounded); + net::CapturingBoundNetLog log; // This prevents a number of write events from being logged. log.SetLogLevel(net::NetLog::LOG_BASIC); diff --git a/net/http/http_network_transaction_spdy2_unittest.cc b/net/http/http_network_transaction_spdy2_unittest.cc index ddd5367709c0..f11aebdb7264 100644 --- a/net/http/http_network_transaction_spdy2_unittest.cc +++ b/net/http/http_network_transaction_spdy2_unittest.cc @@ -235,7 +235,7 @@ class HttpNetworkTransactionSpdy2Test : public PlatformTest { 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); @@ -1741,7 +1741,7 @@ TEST_F(HttpNetworkTransactionSpdy2Test, BasicAuthProxyNoKeepAlive) { // 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 session(CreateSession(&session_deps)); @@ -1847,7 +1847,7 @@ TEST_F(HttpNetworkTransactionSpdy2Test, BasicAuthProxyKeepAlive) { // 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 session(CreateSession(&session_deps)); @@ -2050,7 +2050,7 @@ TEST_F(HttpNetworkTransactionSpdy2Test, 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 session(CreateSession(&session_deps)); @@ -2109,7 +2109,7 @@ TEST_F(HttpNetworkTransactionSpdy2Test, HttpsProxyGet) { // 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 session(CreateSession(&session_deps)); @@ -2165,7 +2165,7 @@ TEST_F(HttpNetworkTransactionSpdy2Test, HttpsProxySpdyGet) { // 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 session(CreateSession(&session_deps)); @@ -2223,7 +2223,7 @@ TEST_F(HttpNetworkTransactionSpdy2Test, HttpsProxySpdyGetWithProxyAuth) { // 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 session(CreateSession(&session_deps)); @@ -2323,7 +2323,7 @@ TEST_F(HttpNetworkTransactionSpdy2Test, HttpsProxySpdyConnectHttps) { // 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 session(CreateSession(&session_deps)); @@ -2404,7 +2404,7 @@ TEST_F(HttpNetworkTransactionSpdy2Test, HttpsProxySpdyConnectSpdy) { // 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 session(CreateSession(&session_deps)); @@ -2483,7 +2483,7 @@ TEST_F(HttpNetworkTransactionSpdy2Test, HttpsProxySpdyConnectFailure) { // 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 session(CreateSession(&session_deps)); @@ -2542,7 +2542,7 @@ TEST_F(HttpNetworkTransactionSpdy2Test, HttpsProxyAuthRetry) { // 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 session(CreateSession(&session_deps)); @@ -4918,7 +4918,7 @@ TEST_F(HttpNetworkTransactionSpdy2Test, BasicAuthSpdyProxy) { // 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 session(CreateSession(&session_deps)); @@ -5066,7 +5066,7 @@ TEST_F(HttpNetworkTransactionSpdy2Test, CrossOriginProxyPush) { // 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 @@ TEST_F(HttpNetworkTransactionSpdy2Test, CrossOriginProxyPushCorrectness) { // 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. @@ -8793,7 +8793,7 @@ TEST_F(HttpNetworkTransactionSpdy2Test, SimpleCancel) { 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. @@ -8804,7 +8804,7 @@ TEST_F(HttpNetworkTransactionSpdy2Test, SimpleCancel) { // Test a basic GET request through a proxy. TEST_F(HttpNetworkTransactionSpdy2Test, ProxyGet) { SessionDependencies session_deps(ProxyService::CreateFixed("myproxy:70")); - CapturingBoundNetLog log(CapturingNetLog::kUnbounded); + CapturingBoundNetLog log; session_deps.net_log = log.bound().net_log(); scoped_refptr session(CreateSession(&session_deps)); @@ -8852,7 +8852,7 @@ TEST_F(HttpNetworkTransactionSpdy2Test, ProxyGet) { // Test a basic HTTPS GET request through a proxy. TEST_F(HttpNetworkTransactionSpdy2Test, ProxyTunnelGet) { SessionDependencies session_deps(ProxyService::CreateFixed("myproxy:70")); - CapturingBoundNetLog log(CapturingNetLog::kUnbounded); + CapturingBoundNetLog log; session_deps.net_log = log.bound().net_log(); scoped_refptr session(CreateSession(&session_deps)); @@ -8919,7 +8919,7 @@ TEST_F(HttpNetworkTransactionSpdy2Test, ProxyTunnelGet) { // while establishing the tunnel. TEST_F(HttpNetworkTransactionSpdy2Test, ProxyTunnelGetHangup) { SessionDependencies session_deps(ProxyService::CreateFixed("myproxy:70")); - CapturingBoundNetLog log(CapturingNetLog::kUnbounded); + CapturingBoundNetLog log; session_deps.net_log = log.bound().net_log(); scoped_refptr session(CreateSession(&session_deps)); @@ -9307,7 +9307,7 @@ TEST_F(HttpNetworkTransactionSpdy2Test, TEST_F(HttpNetworkTransactionSpdy2Test, 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 cert_request(new SSLCertRequestInfo()); diff --git a/net/http/http_network_transaction_spdy3_unittest.cc b/net/http/http_network_transaction_spdy3_unittest.cc index 4465a1ced039..4b67b28b4460 100644 --- a/net/http/http_network_transaction_spdy3_unittest.cc +++ b/net/http/http_network_transaction_spdy3_unittest.cc @@ -235,7 +235,7 @@ class HttpNetworkTransactionSpdy3Test : public PlatformTest { 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 @@ class HttpNetworkTransactionSpdy3Test : public PlatformTest { 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 @@ TEST_F(HttpNetworkTransactionSpdy3Test, BasicAuthProxyNoKeepAlive) { // 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 session(CreateSession(&session_deps)); @@ -1794,7 +1794,7 @@ TEST_F(HttpNetworkTransactionSpdy3Test, BasicAuthProxyNoKeepAlive) { 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 @@ TEST_F(HttpNetworkTransactionSpdy3Test, BasicAuthProxyKeepAlive) { // 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 session(CreateSession(&session_deps)); @@ -1895,7 +1895,7 @@ TEST_F(HttpNetworkTransactionSpdy3Test, BasicAuthProxyKeepAlive) { 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 @@ TEST_F(HttpNetworkTransactionSpdy3Test, 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 session(CreateSession(&session_deps)); @@ -2089,7 +2089,7 @@ TEST_F(HttpNetworkTransactionSpdy3Test, 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 @@ TEST_F(HttpNetworkTransactionSpdy3Test, HttpsProxyGet) { // 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 session(CreateSession(&session_deps)); @@ -2165,7 +2165,7 @@ TEST_F(HttpNetworkTransactionSpdy3Test, HttpsProxySpdyGet) { // 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 session(CreateSession(&session_deps)); @@ -2223,7 +2223,7 @@ TEST_F(HttpNetworkTransactionSpdy3Test, HttpsProxySpdyGetWithProxyAuth) { // 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 session(CreateSession(&session_deps)); @@ -2323,7 +2323,7 @@ TEST_F(HttpNetworkTransactionSpdy3Test, HttpsProxySpdyConnectHttps) { // 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 session(CreateSession(&session_deps)); @@ -2404,7 +2404,7 @@ TEST_F(HttpNetworkTransactionSpdy3Test, HttpsProxySpdyConnectSpdy) { // 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 session(CreateSession(&session_deps)); @@ -2483,7 +2483,7 @@ TEST_F(HttpNetworkTransactionSpdy3Test, HttpsProxySpdyConnectFailure) { // 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 session(CreateSession(&session_deps)); @@ -2542,7 +2542,7 @@ TEST_F(HttpNetworkTransactionSpdy3Test, HttpsProxyAuthRetry) { // 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 session(CreateSession(&session_deps)); @@ -4918,7 +4918,7 @@ TEST_F(HttpNetworkTransactionSpdy3Test, BasicAuthSpdyProxy) { // 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 session(CreateSession(&session_deps)); @@ -5004,7 +5004,7 @@ TEST_F(HttpNetworkTransactionSpdy3Test, BasicAuthSpdyProxy) { 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 @@ TEST_F(HttpNetworkTransactionSpdy3Test, CrossOriginProxyPush) { // 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 @@ TEST_F(HttpNetworkTransactionSpdy3Test, CrossOriginProxyPushCorrectness) { // 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 @@ TEST_F(HttpNetworkTransactionSpdy3Test, SimpleCancel) { 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_F(HttpNetworkTransactionSpdy3Test, SimpleCancel) { // 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 session(CreateSession(&session_deps)); @@ -8851,7 +8851,7 @@ TEST_F(HttpNetworkTransactionSpdy3Test, ProxyGet) { // 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 session(CreateSession(&session_deps)); @@ -8894,7 +8894,7 @@ TEST_F(HttpNetworkTransactionSpdy3Test, ProxyTunnelGet) { 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 @@ TEST_F(HttpNetworkTransactionSpdy3Test, ProxyTunnelGet) { // 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 session(CreateSession(&session_deps)); @@ -8958,7 +8958,7 @@ TEST_F(HttpNetworkTransactionSpdy3Test, ProxyTunnelGetHangup) { 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_Direct_FalseStart) { 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 cert_request(new SSLCertRequestInfo()); diff --git a/net/proxy/multi_threaded_proxy_resolver_unittest.cc b/net/proxy/multi_threaded_proxy_resolver_unittest.cc index d5741782d6b0..595fd787a0d3 100644 --- a/net/proxy/multi_threaded_proxy_resolver_unittest.cc +++ b/net/proxy/multi_threaded_proxy_resolver_unittest.cc @@ -276,7 +276,7 @@ TEST(MultiThreadedProxyResolverTest, SingleThread_Basic) { // Start request 0. TestCompletionCallback callback0; - CapturingBoundNetLog log0(CapturingNetLog::kUnbounded); + CapturingBoundNetLog log0; ProxyInfo results0; rv = resolver.GetProxyForURL(GURL("http://request0"), &results0, callback0.callback(), NULL, log0.bound()); @@ -291,7 +291,7 @@ TEST(MultiThreadedProxyResolverTest, SingleThread_Basic) { // on completion, this should have been copied into |log0|. // We also have 1 log entry that was emitted by the // MultiThreadedProxyResolver. - net::CapturingNetLog::CapturedEntryList entries0; + CapturingNetLog::CapturedEntryList entries0; log0.GetEntries(&entries0); ASSERT_EQ(2u, entries0.size()); @@ -370,7 +370,7 @@ TEST(MultiThreadedProxyResolverTest, ProxyResolver::RequestHandle request0; TestCompletionCallback callback0; ProxyInfo results0; - CapturingBoundNetLog log0(CapturingNetLog::kUnbounded); + CapturingBoundNetLog log0; rv = resolver.GetProxyForURL(GURL("http://request0"), &results0, callback0.callback(), &request0, log0.bound()); EXPECT_EQ(ERR_IO_PENDING, rv); @@ -379,7 +379,7 @@ TEST(MultiThreadedProxyResolverTest, TestCompletionCallback callback1; ProxyInfo results1; - CapturingBoundNetLog log1(CapturingNetLog::kUnbounded); + CapturingBoundNetLog log1; rv = resolver.GetProxyForURL(GURL("http://request1"), &results1, callback1.callback(), NULL, log1.bound()); EXPECT_EQ(ERR_IO_PENDING, rv); @@ -387,7 +387,7 @@ TEST(MultiThreadedProxyResolverTest, ProxyResolver::RequestHandle request2; TestCompletionCallback callback2; ProxyInfo results2; - CapturingBoundNetLog log2(CapturingNetLog::kUnbounded); + CapturingBoundNetLog log2; rv = resolver.GetProxyForURL(GURL("http://request2"), &results2, callback2.callback(), &request2, log2.bound()); EXPECT_EQ(ERR_IO_PENDING, rv); @@ -402,7 +402,7 @@ TEST(MultiThreadedProxyResolverTest, EXPECT_EQ(0, callback0.WaitForResult()); EXPECT_EQ("PROXY request0:80", results0.ToPacString()); - net::CapturingNetLog::CapturedEntryList entries0; + CapturingNetLog::CapturedEntryList entries0; log0.GetEntries(&entries0); ASSERT_EQ(2u, entries0.size()); @@ -413,7 +413,7 @@ TEST(MultiThreadedProxyResolverTest, EXPECT_EQ(1, callback1.WaitForResult()); EXPECT_EQ("PROXY request1:80", results1.ToPacString()); - net::CapturingNetLog::CapturedEntryList entries1; + CapturingNetLog::CapturedEntryList entries1; log1.GetEntries(&entries1); ASSERT_EQ(4u, entries1.size()); @@ -428,7 +428,7 @@ TEST(MultiThreadedProxyResolverTest, EXPECT_EQ(2, callback2.WaitForResult()); EXPECT_EQ("PROXY request2:80", results2.ToPacString()); - net::CapturingNetLog::CapturedEntryList entries2; + CapturingNetLog::CapturedEntryList entries2; log2.GetEntries(&entries2); ASSERT_EQ(4u, entries2.size()); diff --git a/net/proxy/proxy_resolver_js_bindings_unittest.cc b/net/proxy/proxy_resolver_js_bindings_unittest.cc index 0b1e2dc68497..97d69bf4bbc1 100644 --- a/net/proxy/proxy_resolver_js_bindings_unittest.cc +++ b/net/proxy/proxy_resolver_js_bindings_unittest.cc @@ -33,7 +33,7 @@ class MockHostResolverWithMultipleResults : public SyncHostResolver { // HostResolver methods: virtual int Resolve(const HostResolver::RequestInfo& info, AddressList* addresses, - const net::BoundNetLog& bound_net_log) OVERRIDE { + const BoundNetLog& bound_net_log) OVERRIDE { return ParseAddressList("192.168.1.1,172.22.34.1,200.100.1.2", "", addresses); } @@ -51,7 +51,7 @@ class MockFailingHostResolver : public SyncHostResolver { // HostResolver methods: virtual int Resolve(const HostResolver::RequestInfo& info, AddressList* addresses, - const net::BoundNetLog& bound_net_log) OVERRIDE { + const BoundNetLog& bound_net_log) OVERRIDE { count_++; return ERR_NAME_NOT_RESOLVED; } @@ -74,7 +74,7 @@ class MockSyncHostResolver : public SyncHostResolver { virtual int Resolve(const HostResolver::RequestInfo& info, AddressList* addresses, - const net::BoundNetLog& bound_net_log) OVERRIDE { + const BoundNetLog& bound_net_log) OVERRIDE { return resolver_.Resolve(info, addresses, CompletionCallback(), NULL, bound_net_log); } @@ -267,7 +267,7 @@ TEST(ProxyResolverJSBindingsTest, PerRequestDNSCache) { TEST(ProxyResolverJSBindingsTest, NetLog) { MockFailingHostResolver* host_resolver = new MockFailingHostResolver; - CapturingNetLog global_log(CapturingNetLog::kUnbounded); + CapturingNetLog global_log; // Get a hold of a DefaultJSBindings* (it is a hidden impl class). scoped_ptr bindings( @@ -275,7 +275,7 @@ TEST(ProxyResolverJSBindingsTest, NetLog) { host_resolver, &global_log, NULL)); // Attach a capturing NetLog as the current request's log stream. - CapturingNetLog log(CapturingNetLog::kUnbounded); + CapturingNetLog log; BoundNetLog bound_log(BoundNetLog::Make(&log, NetLog::SOURCE_NONE)); ProxyResolverRequestContext context(&bound_log, NULL); bindings->set_current_request_context(&context); diff --git a/net/proxy/proxy_resolver_v8_unittest.cc b/net/proxy/proxy_resolver_v8_unittest.cc index f1621a12dd1a..b93d4f3e43fe 100644 --- a/net/proxy/proxy_resolver_v8_unittest.cc +++ b/net/proxy/proxy_resolver_v8_unittest.cc @@ -130,7 +130,7 @@ TEST(ProxyResolverV8Test, Direct) { EXPECT_EQ(OK, result); ProxyInfo proxy_info; - CapturingBoundNetLog log(CapturingNetLog::kUnbounded); + CapturingBoundNetLog log; result = resolver.GetProxyForURL( kQueryUrl, &proxy_info, CompletionCallback(), NULL, log.bound()); @@ -475,9 +475,8 @@ TEST(ProxyResolverV8Test, EndsWithCommentNoNewline) { EXPECT_EQ(OK, result); ProxyInfo proxy_info; - CapturingBoundNetLog log(CapturingNetLog::kUnbounded); result = resolver.GetProxyForURL( - kQueryUrl, &proxy_info, CompletionCallback(), NULL, log.bound()); + kQueryUrl, &proxy_info, CompletionCallback(), NULL, BoundNetLog()); EXPECT_EQ(OK, result); EXPECT_FALSE(proxy_info.is_direct()); @@ -495,9 +494,8 @@ TEST(ProxyResolverV8Test, EndsWithStatementNoNewline) { EXPECT_EQ(OK, result); ProxyInfo proxy_info; - CapturingBoundNetLog log(CapturingNetLog::kUnbounded); result = resolver.GetProxyForURL( - kQueryUrl, &proxy_info, CompletionCallback(), NULL, log.bound()); + kQueryUrl, &proxy_info, CompletionCallback(), NULL, BoundNetLog()); EXPECT_EQ(OK, result); EXPECT_FALSE(proxy_info.is_direct()); diff --git a/net/proxy/proxy_script_decider_unittest.cc b/net/proxy/proxy_script_decider_unittest.cc index a068df1548b6..7cdefa4b6fc0 100644 --- a/net/proxy/proxy_script_decider_unittest.cc +++ b/net/proxy/proxy_script_decider_unittest.cc @@ -127,7 +127,7 @@ TEST(ProxyScriptDeciderTest, CustomPacSucceeds) { Rules::Rule rule = rules.AddSuccessRule("http://custom/proxy.pac"); TestCompletionCallback callback; - CapturingNetLog log(CapturingNetLog::kUnbounded); + CapturingNetLog log; ProxyScriptDecider decider(&fetcher, &dhcp_fetcher, &log); EXPECT_EQ(OK, decider.Start( config, base::TimeDelta(), true, callback.callback())); @@ -163,7 +163,7 @@ TEST(ProxyScriptDeciderTest, CustomPacFails1) { rules.AddFailDownloadRule("http://custom/proxy.pac"); TestCompletionCallback callback; - CapturingNetLog log(CapturingNetLog::kUnbounded); + CapturingNetLog log; ProxyScriptDecider decider(&fetcher, &dhcp_fetcher, &log); EXPECT_EQ(kFailedDownloading, decider.Start(config, base::TimeDelta(), true, @@ -282,7 +282,7 @@ TEST(ProxyScriptDeciderTest, AutodetectFailCustomSuccess2) { Rules::Rule rule = rules.AddSuccessRule("http://custom/proxy.pac"); TestCompletionCallback callback; - CapturingNetLog log(CapturingNetLog::kUnbounded); + CapturingNetLog log; ProxyScriptDecider decider(&fetcher, &dhcp_fetcher, &log); EXPECT_EQ(OK, decider.Start(config, base::TimeDelta(), @@ -387,7 +387,7 @@ TEST(ProxyScriptDeciderTest, CustomPacFails1_WithPositiveDelay) { rules.AddFailDownloadRule("http://custom/proxy.pac"); TestCompletionCallback callback; - CapturingNetLog log(CapturingNetLog::kUnbounded); + CapturingNetLog log; ProxyScriptDecider decider(&fetcher, &dhcp_fetcher, &log); EXPECT_EQ(ERR_IO_PENDING, decider.Start(config, base::TimeDelta::FromMilliseconds(1), @@ -429,7 +429,7 @@ TEST(ProxyScriptDeciderTest, CustomPacFails1_WithNegativeDelay) { rules.AddFailDownloadRule("http://custom/proxy.pac"); TestCompletionCallback callback; - CapturingNetLog log(CapturingNetLog::kUnbounded); + CapturingNetLog log; ProxyScriptDecider decider(&fetcher, &dhcp_fetcher, &log); EXPECT_EQ(kFailedDownloading, decider.Start(config, base::TimeDelta::FromSeconds(-5), diff --git a/net/proxy/proxy_service_unittest.cc b/net/proxy/proxy_service_unittest.cc index 146fec21c510..abd6d6aa0752 100644 --- a/net/proxy/proxy_service_unittest.cc +++ b/net/proxy/proxy_service_unittest.cc @@ -162,7 +162,7 @@ TEST_F(ProxyServiceTest, Direct) { ProxyInfo info; TestCompletionCallback callback; - CapturingBoundNetLog log(CapturingNetLog::kUnbounded); + CapturingBoundNetLog log; int rv = service.ResolveProxy( url, &info, callback.callback(), NULL, log.bound()); EXPECT_EQ(OK, rv); @@ -196,7 +196,7 @@ TEST_F(ProxyServiceTest, PAC) { ProxyInfo info; TestCompletionCallback callback; - CapturingBoundNetLog log(CapturingNetLog::kUnbounded); + CapturingBoundNetLog log; int rv = service.ResolveProxy( url, &info, callback.callback(), NULL, log.bound()); @@ -1409,7 +1409,7 @@ TEST_F(ProxyServiceTest, CancelWhilePACFetching) { ProxyInfo info1; TestCompletionCallback callback1; ProxyService::PacRequest* request1; - CapturingBoundNetLog log1(CapturingNetLog::kUnbounded); + CapturingBoundNetLog log1; int rv = service.ResolveProxy(GURL("http://request1"), &info1, callback1.callback(), &request1, log1.bound()); EXPECT_EQ(ERR_IO_PENDING, rv); @@ -1893,7 +1893,7 @@ TEST_F(ProxyServiceTest, NetworkChangeTriggersPacRefetch) { MockAsyncProxyResolverExpectsBytes* resolver = new MockAsyncProxyResolverExpectsBytes; - CapturingNetLog log(CapturingNetLog::kUnbounded); + CapturingNetLog log; ProxyService service(config_service, resolver, &log); @@ -2013,9 +2013,7 @@ TEST_F(ProxyServiceTest, PACScriptRefetchAfterFailure) { MockAsyncProxyResolverExpectsBytes* resolver = new MockAsyncProxyResolverExpectsBytes; - CapturingNetLog log(CapturingNetLog::kUnbounded); - - ProxyService service(config_service, resolver, &log); + ProxyService service(config_service, resolver, NULL); MockProxyScriptFetcher* fetcher = new MockProxyScriptFetcher; service.SetProxyScriptFetchers(fetcher, @@ -2120,9 +2118,7 @@ TEST_F(ProxyServiceTest, PACScriptRefetchAfterContentChange) { MockAsyncProxyResolverExpectsBytes* resolver = new MockAsyncProxyResolverExpectsBytes; - CapturingNetLog log(CapturingNetLog::kUnbounded); - - ProxyService service(config_service, resolver, &log); + ProxyService service(config_service, resolver, NULL); MockProxyScriptFetcher* fetcher = new MockProxyScriptFetcher; service.SetProxyScriptFetchers(fetcher, @@ -2232,9 +2228,7 @@ TEST_F(ProxyServiceTest, PACScriptRefetchAfterContentUnchanged) { MockAsyncProxyResolverExpectsBytes* resolver = new MockAsyncProxyResolverExpectsBytes; - CapturingNetLog log(CapturingNetLog::kUnbounded); - - ProxyService service(config_service, resolver, &log); + ProxyService service(config_service, resolver, NULL); MockProxyScriptFetcher* fetcher = new MockProxyScriptFetcher; service.SetProxyScriptFetchers(fetcher, @@ -2340,9 +2334,7 @@ TEST_F(ProxyServiceTest, PACScriptRefetchAfterSuccess) { MockAsyncProxyResolverExpectsBytes* resolver = new MockAsyncProxyResolverExpectsBytes; - CapturingNetLog log(CapturingNetLog::kUnbounded); - - ProxyService service(config_service, resolver, &log); + ProxyService service(config_service, resolver, NULL); MockProxyScriptFetcher* fetcher = new MockProxyScriptFetcher; service.SetProxyScriptFetchers(fetcher, @@ -2494,9 +2486,7 @@ TEST_F(ProxyServiceTest, PACScriptRefetchAfterActivity) { MockAsyncProxyResolverExpectsBytes* resolver = new MockAsyncProxyResolverExpectsBytes; - CapturingNetLog log(CapturingNetLog::kUnbounded); - - ProxyService service(config_service, resolver, &log); + ProxyService service(config_service, resolver, NULL); MockProxyScriptFetcher* fetcher = new MockProxyScriptFetcher; service.SetProxyScriptFetchers(fetcher, diff --git a/net/socket/client_socket_pool_base_unittest.cc b/net/socket/client_socket_pool_base_unittest.cc index c650bff94485..24dde96913b1 100644 --- a/net/socket/client_socket_pool_base_unittest.cc +++ b/net/socket/client_socket_pool_base_unittest.cc @@ -766,7 +766,7 @@ TEST_F(ClientSocketPoolBaseTest, ConnectJob_NoTimeoutOnSynchronousCompletion) { TEST_F(ClientSocketPoolBaseTest, ConnectJob_TimedOut) { TestConnectJobDelegate delegate; ClientSocketHandle ignored; - CapturingNetLog log(CapturingNetLog::kUnbounded); + CapturingNetLog log; TestClientSocketPoolBase::Request request( &ignored, CompletionCallback(), kDefaultPriority, @@ -785,7 +785,7 @@ TEST_F(ClientSocketPoolBaseTest, ConnectJob_TimedOut) { base::PlatformThread::Sleep(base::TimeDelta::FromMilliseconds(1)); EXPECT_EQ(ERR_TIMED_OUT, delegate.WaitForResult()); - net::CapturingNetLog::CapturedEntryList entries; + CapturingNetLog::CapturedEntryList entries; log.GetEntries(&entries); EXPECT_EQ(6u, entries.size()); @@ -810,7 +810,7 @@ TEST_F(ClientSocketPoolBaseTest, BasicSynchronous) { TestCompletionCallback callback; ClientSocketHandle handle; - CapturingBoundNetLog log(CapturingNetLog::kUnbounded); + CapturingBoundNetLog log; EXPECT_EQ(OK, handle.Init("a", @@ -823,7 +823,7 @@ TEST_F(ClientSocketPoolBaseTest, BasicSynchronous) { EXPECT_TRUE(handle.socket()); handle.Reset(); - net::CapturingNetLog::CapturedEntryList entries; + CapturingNetLog::CapturedEntryList entries; log.GetEntries(&entries); EXPECT_EQ(4u, entries.size()); @@ -843,7 +843,7 @@ TEST_F(ClientSocketPoolBaseTest, InitConnectionFailure) { CreatePool(kDefaultMaxSockets, kDefaultMaxSocketsPerGroup); connect_job_factory_->set_job_type(TestConnectJob::kMockFailingJob); - CapturingBoundNetLog log(CapturingNetLog::kUnbounded); + CapturingBoundNetLog log; ClientSocketHandle handle; TestCompletionCallback callback; @@ -863,7 +863,7 @@ TEST_F(ClientSocketPoolBaseTest, InitConnectionFailure) { EXPECT_FALSE(handle.is_ssl_error()); EXPECT_TRUE(handle.ssl_error_response_info().headers.get() == NULL); - net::CapturingNetLog::CapturedEntryList entries; + CapturingNetLog::CapturedEntryList entries; log.GetEntries(&entries); EXPECT_EQ(3u, entries.size()); @@ -1676,7 +1676,7 @@ TEST_F(ClientSocketPoolBaseTest, BasicAsynchronous) { connect_job_factory_->set_job_type(TestConnectJob::kMockPendingJob); ClientSocketHandle handle; TestCompletionCallback callback; - CapturingBoundNetLog log(CapturingNetLog::kUnbounded); + CapturingBoundNetLog log; int rv = handle.Init("a", params_, LOWEST, @@ -1690,7 +1690,7 @@ TEST_F(ClientSocketPoolBaseTest, BasicAsynchronous) { EXPECT_TRUE(handle.socket()); handle.Reset(); - net::CapturingNetLog::CapturedEntryList entries; + CapturingNetLog::CapturedEntryList entries; log.GetEntries(&entries); EXPECT_EQ(4u, entries.size()); @@ -1713,7 +1713,7 @@ TEST_F(ClientSocketPoolBaseTest, connect_job_factory_->set_job_type(TestConnectJob::kMockPendingFailingJob); ClientSocketHandle handle; TestCompletionCallback callback; - CapturingBoundNetLog log(CapturingNetLog::kUnbounded); + CapturingBoundNetLog log; // Set the additional error state members to ensure that they get cleared. handle.set_is_ssl_error(true); HttpResponseInfo info; @@ -1730,7 +1730,7 @@ TEST_F(ClientSocketPoolBaseTest, EXPECT_FALSE(handle.is_ssl_error()); EXPECT_TRUE(handle.ssl_error_response_info().headers.get() == NULL); - net::CapturingNetLog::CapturedEntryList entries; + CapturingNetLog::CapturedEntryList entries; log.GetEntries(&entries); EXPECT_EQ(3u, entries.size()); @@ -1761,7 +1761,7 @@ TEST_F(ClientSocketPoolBaseTest, TwoRequestsCancelOne) { callback.callback(), pool_.get(), BoundNetLog())); - CapturingBoundNetLog log2(CapturingNetLog::kUnbounded); + CapturingBoundNetLog log2; EXPECT_EQ(ERR_IO_PENDING, handle2.Init("a", params_, @@ -2048,7 +2048,7 @@ TEST_F(ClientSocketPoolBaseTest, DisableCleanupTimerReuse) { // Request a new socket. This should reuse the old socket and complete // synchronously. - CapturingBoundNetLog log(CapturingNetLog::kUnbounded); + CapturingBoundNetLog log; rv = handle.Init("a", params_, LOWEST, @@ -2062,7 +2062,7 @@ TEST_F(ClientSocketPoolBaseTest, DisableCleanupTimerReuse) { EXPECT_EQ(0, pool_->IdleSocketCountInGroup("a")); EXPECT_EQ(1, pool_->NumActiveSocketsInGroup("a")); - net::CapturingNetLog::CapturedEntryList entries; + CapturingNetLog::CapturedEntryList entries; log.GetEntries(&entries); EXPECT_TRUE(LogContainsEntryWithType( entries, 1, NetLog::TYPE_SOCKET_POOL_REUSED_AN_EXISTING_SOCKET)); @@ -2127,7 +2127,7 @@ TEST_F(ClientSocketPoolBaseTest, DisableCleanupTimerNoReuse) { // Request a new socket. This should cleanup the unused and timed out ones. // A new socket will be created rather than reusing the idle one. - CapturingBoundNetLog log(CapturingNetLog::kUnbounded); + CapturingBoundNetLog log; TestCompletionCallback callback3; rv = handle.Init("a", params_, @@ -2144,7 +2144,7 @@ TEST_F(ClientSocketPoolBaseTest, DisableCleanupTimerNoReuse) { EXPECT_EQ(0, pool_->IdleSocketCountInGroup("a")); EXPECT_EQ(1, pool_->NumActiveSocketsInGroup("a")); - net::CapturingNetLog::CapturedEntryList entries; + CapturingNetLog::CapturedEntryList entries; log.GetEntries(&entries); EXPECT_FALSE(LogContainsEntryWithType( entries, 1, NetLog::TYPE_SOCKET_POOL_REUSED_AN_EXISTING_SOCKET)); @@ -2206,7 +2206,7 @@ TEST_F(ClientSocketPoolBaseTest, CleanupTimedOutIdleSockets) { // used socket. Request it to make sure that it's used. pool_->CleanupTimedOutIdleSockets(); - CapturingBoundNetLog log(CapturingNetLog::kUnbounded); + CapturingBoundNetLog log; rv = handle.Init("a", params_, LOWEST, @@ -2216,7 +2216,7 @@ TEST_F(ClientSocketPoolBaseTest, CleanupTimedOutIdleSockets) { EXPECT_EQ(OK, rv); EXPECT_TRUE(handle.is_reused()); - net::CapturingNetLog::CapturedEntryList entries; + CapturingNetLog::CapturedEntryList entries; log.GetEntries(&entries); EXPECT_TRUE(LogContainsEntryWithType( entries, 1, NetLog::TYPE_SOCKET_POOL_REUSED_AN_EXISTING_SOCKET)); diff --git a/net/socket/socks5_client_socket_unittest.cc b/net/socket/socks5_client_socket_unittest.cc index 37daf19051ba..efdd129df93a 100644 --- a/net/socket/socks5_client_socket_unittest.cc +++ b/net/socket/socks5_client_socket_unittest.cc @@ -58,7 +58,6 @@ class SOCKS5ClientSocketTest : public PlatformTest { SOCKS5ClientSocketTest::SOCKS5ClientSocketTest() : kNwPort(base::HostToNet16(80)), - net_log_(CapturingNetLog::kUnbounded), host_resolver_(new MockHostResolver) { } @@ -136,7 +135,7 @@ TEST_F(SOCKS5ClientSocketTest, CompleteHandshake) { EXPECT_EQ(ERR_IO_PENDING, rv); EXPECT_FALSE(user_sock_->IsConnected()); - net::CapturingNetLog::CapturedEntryList net_log_entries; + CapturingNetLog::CapturedEntryList net_log_entries; net_log_.GetEntries(&net_log_entries); EXPECT_TRUE(LogContainsBeginEvent(net_log_entries, 0, NetLog::TYPE_SOCKS5_CONNECT)); @@ -258,7 +257,7 @@ TEST_F(SOCKS5ClientSocketTest, PartialReadWrites) { int rv = user_sock_->Connect(callback_.callback()); EXPECT_EQ(ERR_IO_PENDING, rv); - net::CapturingNetLog::CapturedEntryList net_log_entries; + CapturingNetLog::CapturedEntryList net_log_entries; net_log_.GetEntries(&net_log_entries); EXPECT_TRUE(LogContainsBeginEvent(net_log_entries, 0, NetLog::TYPE_SOCKS5_CONNECT)); @@ -289,7 +288,7 @@ TEST_F(SOCKS5ClientSocketTest, PartialReadWrites) { int rv = user_sock_->Connect(callback_.callback()); EXPECT_EQ(ERR_IO_PENDING, rv); - net::CapturingNetLog::CapturedEntryList net_log_entries; + CapturingNetLog::CapturedEntryList net_log_entries; net_log_.GetEntries(&net_log_entries); EXPECT_TRUE(LogContainsBeginEvent(net_log_entries, 0, NetLog::TYPE_SOCKS5_CONNECT)); @@ -318,7 +317,7 @@ TEST_F(SOCKS5ClientSocketTest, PartialReadWrites) { hostname, 80, &net_log_)); int rv = user_sock_->Connect(callback_.callback()); EXPECT_EQ(ERR_IO_PENDING, rv); - net::CapturingNetLog::CapturedEntryList net_log_entries; + CapturingNetLog::CapturedEntryList net_log_entries; net_log_.GetEntries(&net_log_entries); EXPECT_TRUE(LogContainsBeginEvent(net_log_entries, 0, NetLog::TYPE_SOCKS5_CONNECT)); @@ -349,7 +348,7 @@ TEST_F(SOCKS5ClientSocketTest, PartialReadWrites) { hostname, 80, &net_log_)); int rv = user_sock_->Connect(callback_.callback()); EXPECT_EQ(ERR_IO_PENDING, rv); - net::CapturingNetLog::CapturedEntryList net_log_entries; + CapturingNetLog::CapturedEntryList net_log_entries; net_log_.GetEntries(&net_log_entries); EXPECT_TRUE(LogContainsBeginEvent(net_log_entries, 0, NetLog::TYPE_SOCKS5_CONNECT)); diff --git a/net/socket/socks_client_socket_unittest.cc b/net/socket/socks_client_socket_unittest.cc index 6a42faa6b5f7..2677b5b4f4fa 100644 --- a/net/socket/socks_client_socket_unittest.cc +++ b/net/socket/socks_client_socket_unittest.cc @@ -132,7 +132,7 @@ TEST_F(SOCKSClientSocketTest, CompleteHandshake) { MockRead data_reads[] = { MockRead(ASYNC, kSOCKSOkReply, arraysize(kSOCKSOkReply)), MockRead(ASYNC, payload_read.data(), payload_read.size()) }; - CapturingNetLog log(CapturingNetLog::kUnbounded); + CapturingNetLog log; user_sock_.reset(BuildMockSocket(data_reads, arraysize(data_reads), data_writes, arraysize(data_writes), @@ -147,7 +147,7 @@ TEST_F(SOCKSClientSocketTest, CompleteHandshake) { int rv = user_sock_->Connect(callback_.callback()); EXPECT_EQ(ERR_IO_PENDING, rv); - net::CapturingNetLog::CapturedEntryList entries; + CapturingNetLog::CapturedEntryList entries; log.GetEntries(&entries); EXPECT_TRUE( LogContainsBeginEvent(entries, 0, NetLog::TYPE_SOCKS_CONNECT)); @@ -206,7 +206,7 @@ TEST_F(SOCKSClientSocketTest, HandshakeFailures) { MockRead data_reads[] = { MockRead(SYNCHRONOUS, tests[i].fail_reply, arraysize(tests[i].fail_reply)) }; - CapturingNetLog log(CapturingNetLog::kUnbounded); + CapturingNetLog log; user_sock_.reset(BuildMockSocket(data_reads, arraysize(data_reads), data_writes, arraysize(data_writes), @@ -217,7 +217,7 @@ TEST_F(SOCKSClientSocketTest, HandshakeFailures) { int rv = user_sock_->Connect(callback_.callback()); EXPECT_EQ(ERR_IO_PENDING, rv); - net::CapturingNetLog::CapturedEntryList entries; + CapturingNetLog::CapturedEntryList entries; log.GetEntries(&entries); EXPECT_TRUE(LogContainsBeginEvent( entries, 0, NetLog::TYPE_SOCKS_CONNECT)); @@ -243,7 +243,7 @@ TEST_F(SOCKSClientSocketTest, PartialServerReads) { MockRead data_reads[] = { MockRead(ASYNC, kSOCKSPartialReply1, arraysize(kSOCKSPartialReply1)), MockRead(ASYNC, kSOCKSPartialReply2, arraysize(kSOCKSPartialReply2)) }; - CapturingNetLog log(CapturingNetLog::kUnbounded); + CapturingNetLog log; user_sock_.reset(BuildMockSocket(data_reads, arraysize(data_reads), data_writes, arraysize(data_writes), @@ -253,7 +253,7 @@ TEST_F(SOCKSClientSocketTest, PartialServerReads) { int rv = user_sock_->Connect(callback_.callback()); EXPECT_EQ(ERR_IO_PENDING, rv); - net::CapturingNetLog::CapturedEntryList entries; + CapturingNetLog::CapturedEntryList entries; log.GetEntries(&entries); EXPECT_TRUE(LogContainsBeginEvent( entries, 0, NetLog::TYPE_SOCKS_CONNECT)); @@ -281,7 +281,7 @@ TEST_F(SOCKSClientSocketTest, PartialClientWrites) { arraysize(kSOCKSPartialRequest2)) }; MockRead data_reads[] = { MockRead(ASYNC, kSOCKSOkReply, arraysize(kSOCKSOkReply)) }; - CapturingNetLog log(CapturingNetLog::kUnbounded); + CapturingNetLog log; user_sock_.reset(BuildMockSocket(data_reads, arraysize(data_reads), data_writes, arraysize(data_writes), @@ -291,7 +291,7 @@ TEST_F(SOCKSClientSocketTest, PartialClientWrites) { int rv = user_sock_->Connect(callback_.callback()); EXPECT_EQ(ERR_IO_PENDING, rv); - net::CapturingNetLog::CapturedEntryList entries; + CapturingNetLog::CapturedEntryList entries; log.GetEntries(&entries); EXPECT_TRUE(LogContainsBeginEvent( entries, 0, NetLog::TYPE_SOCKS_CONNECT)); @@ -313,7 +313,7 @@ TEST_F(SOCKSClientSocketTest, FailedSocketRead) { MockRead(ASYNC, kSOCKSOkReply, arraysize(kSOCKSOkReply) - 2), // close connection unexpectedly MockRead(SYNCHRONOUS, 0) }; - CapturingNetLog log(CapturingNetLog::kUnbounded); + CapturingNetLog log; user_sock_.reset(BuildMockSocket(data_reads, arraysize(data_reads), data_writes, arraysize(data_writes), @@ -323,7 +323,7 @@ TEST_F(SOCKSClientSocketTest, FailedSocketRead) { int rv = user_sock_->Connect(callback_.callback()); EXPECT_EQ(ERR_IO_PENDING, rv); - net::CapturingNetLog::CapturedEntryList entries; + CapturingNetLog::CapturedEntryList entries; log.GetEntries(&entries); EXPECT_TRUE(LogContainsBeginEvent( entries, 0, NetLog::TYPE_SOCKS_CONNECT)); @@ -343,7 +343,7 @@ TEST_F(SOCKSClientSocketTest, FailedDNS) { host_resolver_->rules()->AddSimulatedFailure(hostname); - CapturingNetLog log(CapturingNetLog::kUnbounded); + CapturingNetLog log; user_sock_.reset(BuildMockSocket(NULL, 0, NULL, 0, @@ -353,7 +353,7 @@ TEST_F(SOCKSClientSocketTest, FailedDNS) { int rv = user_sock_->Connect(callback_.callback()); EXPECT_EQ(ERR_IO_PENDING, rv); - net::CapturingNetLog::CapturedEntryList entries; + CapturingNetLog::CapturedEntryList entries; log.GetEntries(&entries); EXPECT_TRUE(LogContainsBeginEvent( entries, 0, NetLog::TYPE_SOCKS_CONNECT)); diff --git a/net/socket/ssl_client_socket_unittest.cc b/net/socket/ssl_client_socket_unittest.cc index a9379e82d879..8806254073d4 100644 --- a/net/socket/ssl_client_socket_unittest.cc +++ b/net/socket/ssl_client_socket_unittest.cc @@ -79,7 +79,7 @@ TEST_F(SSLClientSocketTest, Connect) { ASSERT_TRUE(test_server.GetAddressList(&addr)); net::TestCompletionCallback callback; - net::CapturingNetLog log(net::CapturingNetLog::kUnbounded); + net::CapturingNetLog log; net::StreamSocket* transport = new net::TCPClientSocket( addr, &log, net::NetLog::Source()); int rv = transport->Connect(callback.callback()); @@ -122,7 +122,7 @@ TEST_F(SSLClientSocketTest, ConnectExpired) { ASSERT_TRUE(test_server.GetAddressList(&addr)); net::TestCompletionCallback callback; - net::CapturingNetLog log(net::CapturingNetLog::kUnbounded); + net::CapturingNetLog log; net::StreamSocket* transport = new net::TCPClientSocket( addr, &log, net::NetLog::Source()); int rv = transport->Connect(callback.callback()); @@ -167,7 +167,7 @@ TEST_F(SSLClientSocketTest, ConnectMismatched) { ASSERT_TRUE(test_server.GetAddressList(&addr)); net::TestCompletionCallback callback; - net::CapturingNetLog log(net::CapturingNetLog::kUnbounded); + net::CapturingNetLog log; net::StreamSocket* transport = new net::TCPClientSocket( addr, &log, net::NetLog::Source()); int rv = transport->Connect(callback.callback()); @@ -212,7 +212,7 @@ TEST_F(SSLClientSocketTest, ConnectClientAuthCertRequested) { ASSERT_TRUE(test_server.GetAddressList(&addr)); net::TestCompletionCallback callback; - net::CapturingNetLog log(net::CapturingNetLog::kUnbounded); + net::CapturingNetLog log; net::StreamSocket* transport = new net::TCPClientSocket( addr, &log, net::NetLog::Source()); int rv = transport->Connect(callback.callback()); @@ -272,7 +272,7 @@ TEST_F(SSLClientSocketTest, ConnectClientAuthSendNullCert) { ASSERT_TRUE(test_server.GetAddressList(&addr)); net::TestCompletionCallback callback; - net::CapturingNetLog log(net::CapturingNetLog::kUnbounded); + net::CapturingNetLog log; net::StreamSocket* transport = new net::TCPClientSocket( addr, &log, net::NetLog::Source()); int rv = transport->Connect(callback.callback()); @@ -549,7 +549,7 @@ TEST_F(SSLClientSocketTest, Read_FullLogging) { ASSERT_TRUE(test_server.GetAddressList(&addr)); net::TestCompletionCallback callback; - net::CapturingNetLog log(net::CapturingNetLog::kUnbounded); + net::CapturingNetLog log; log.SetLogLevel(net::NetLog::LOG_ALL); net::StreamSocket* transport = new net::TCPClientSocket( addr, &log, net::NetLog::Source()); @@ -679,7 +679,7 @@ TEST_F(SSLClientSocketTest, CipherSuiteDisables) { ASSERT_TRUE(test_server.GetAddressList(&addr)); net::TestCompletionCallback callback; - net::CapturingNetLog log(net::CapturingNetLog::kUnbounded); + net::CapturingNetLog log; net::StreamSocket* transport = new net::TCPClientSocket( addr, &log, net::NetLog::Source()); int rv = transport->Connect(callback.callback()); @@ -880,7 +880,7 @@ TEST_F(SSLClientSocketTest, VerifyReturnChainProperlyOrdered) { ASSERT_TRUE(test_server.GetAddressList(&addr)); net::TestCompletionCallback callback; - net::CapturingNetLog log(net::CapturingNetLog::kUnbounded); + net::CapturingNetLog log; net::StreamSocket* transport = new net::TCPClientSocket( addr, &log, net::NetLog::Source()); int rv = transport->Connect(callback.callback()); diff --git a/net/socket/transport_client_socket_unittest.cc b/net/socket/transport_client_socket_unittest.cc index 424d5879c757..36cc44ea3692 100644 --- a/net/socket/transport_client_socket_unittest.cc +++ b/net/socket/transport_client_socket_unittest.cc @@ -39,7 +39,6 @@ class TransportClientSocketTest public: TransportClientSocketTest() : listen_port_(0), - net_log_(CapturingNetLog::kUnbounded), socket_factory_(ClientSocketFactory::GetDefaultFactory()), close_server_socket_on_next_send_(false) { } diff --git a/net/spdy/spdy_network_transaction_spdy2_unittest.cc b/net/spdy/spdy_network_transaction_spdy2_unittest.cc index 9395631745e9..860f10c704a3 100644 --- a/net/spdy/spdy_network_transaction_spdy2_unittest.cc +++ b/net/spdy/spdy_network_transaction_spdy2_unittest.cc @@ -3541,7 +3541,7 @@ TEST_P(SpdyNetworkTransactionSpdy2Test, NetLog) { MockRead(ASYNC, 0, 0) // EOF }; - net::CapturingBoundNetLog log(net::CapturingNetLog::kUnbounded); + CapturingBoundNetLog log; scoped_ptr data( new DelayedSocketData(1, reads, arraysize(reads), diff --git a/net/spdy/spdy_network_transaction_spdy3_unittest.cc b/net/spdy/spdy_network_transaction_spdy3_unittest.cc index 8fc1997cd2ce..56f5fd56c62b 100644 --- a/net/spdy/spdy_network_transaction_spdy3_unittest.cc +++ b/net/spdy/spdy_network_transaction_spdy3_unittest.cc @@ -4116,7 +4116,7 @@ TEST_P(SpdyNetworkTransactionSpdy3Test, NetLog) { MockRead(ASYNC, 0, 0) // EOF }; - net::CapturingBoundNetLog log(net::CapturingNetLog::kUnbounded); + CapturingBoundNetLog log; scoped_ptr data( new DelayedSocketData(1, reads, arraysize(reads), diff --git a/net/spdy/spdy_session_spdy2_unittest.cc b/net/spdy/spdy_session_spdy2_unittest.cc index 450dba4b8696..eb1404f2af3c 100644 --- a/net/spdy/spdy_session_spdy2_unittest.cc +++ b/net/spdy/spdy_session_spdy2_unittest.cc @@ -977,7 +977,7 @@ TEST_F(SpdySessionSpdy2Test, CloseSessionOnError) { MockRead(SYNCHRONOUS, 0, 0) // EOF }; - net::CapturingBoundNetLog log(net::CapturingNetLog::kUnbounded); + CapturingBoundNetLog log; StaticSocketDataProvider data(reads, arraysize(reads), NULL, 0); data.set_connect_data(connect_data); diff --git a/net/spdy/spdy_session_spdy3_unittest.cc b/net/spdy/spdy_session_spdy3_unittest.cc index fcb024fbf7cd..4d2319798728 100644 --- a/net/spdy/spdy_session_spdy3_unittest.cc +++ b/net/spdy/spdy_session_spdy3_unittest.cc @@ -1106,7 +1106,7 @@ TEST_F(SpdySessionSpdy3Test, CloseSessionOnError) { MockRead(SYNCHRONOUS, 0, 0) // EOF }; - net::CapturingBoundNetLog log(net::CapturingNetLog::kUnbounded); + CapturingBoundNetLog log; StaticSocketDataProvider data(reads, arraysize(reads), NULL, 0); data.set_connect_data(connect_data); diff --git a/net/spdy/spdy_stream_spdy2_unittest.cc b/net/spdy/spdy_stream_spdy2_unittest.cc index 1ca21d480f50..dc970eb0559d 100644 --- a/net/spdy/spdy_stream_spdy2_unittest.cc +++ b/net/spdy/spdy_stream_spdy2_unittest.cc @@ -351,7 +351,7 @@ TEST_F(SpdyStreamSpdy2Test, StreamError) { reads[1].sequence_number = 3; reads[2].sequence_number = 4; - net::CapturingBoundNetLog log(net::CapturingNetLog::kUnbounded); + CapturingBoundNetLog log; scoped_ptr data( new OrderedSocketData(reads, arraysize(reads), diff --git a/net/spdy/spdy_stream_spdy3_unittest.cc b/net/spdy/spdy_stream_spdy3_unittest.cc index 1c672711bb0f..09ff003ec5db 100644 --- a/net/spdy/spdy_stream_spdy3_unittest.cc +++ b/net/spdy/spdy_stream_spdy3_unittest.cc @@ -356,7 +356,7 @@ TEST_F(SpdyStreamSpdy3Test, StreamError) { reads[1].sequence_number = 3; reads[2].sequence_number = 4; - net::CapturingBoundNetLog log(net::CapturingNetLog::kUnbounded); + CapturingBoundNetLog log; scoped_ptr data( new OrderedSocketData(reads, arraysize(reads), diff --git a/net/udp/udp_socket_unittest.cc b/net/udp/udp_socket_unittest.cc index b0af0bf54b01..1650709f58a6 100644 --- a/net/udp/udp_socket_unittest.cc +++ b/net/udp/udp_socket_unittest.cc @@ -132,7 +132,7 @@ TEST_F(UDPSocketTest, Connect) { // Setup the server to listen. IPEndPoint bind_address; CreateUDPAddress("0.0.0.0", kPort, &bind_address); - CapturingNetLog server_log(CapturingNetLog::kUnbounded); + CapturingNetLog server_log; scoped_ptr server( new UDPServerSocket(&server_log, NetLog::Source())); int rv = server->Listen(bind_address); @@ -141,7 +141,7 @@ TEST_F(UDPSocketTest, Connect) { // Setup the client. IPEndPoint server_address; CreateUDPAddress("127.0.0.1", kPort, &server_address); - CapturingNetLog client_log(CapturingNetLog::kUnbounded); + CapturingNetLog client_log; scoped_ptr client( new UDPClientSocket(DatagramSocket::DEFAULT_BIND, RandIntCallback(),