From ec2cdb570bba6932eaaac5bec548f0b8776a14bc Mon Sep 17 00:00:00 2001 From: pkasting Date: Fri, 1 May 2015 18:19:34 -0700 Subject: [PATCH] Remove outdated instrumentation and move a few remaining bits around. BUG=424359,455469,455884,457528,483686,483689 TEST=none TBR=mattm,erikwright,zea Review URL: https://codereview.chromium.org/1119163004 Cr-Commit-Position: refs/heads/master@{#328038} --- chrome/browser/safe_browsing/protocol_manager.cc | 9 ++ .../browser/safe_browsing/safe_browsing_service.cc | 26 ------ .../browser/net/sqlite_persistent_cookie_store.cc | 9 +- google_apis/gcm/engine/connection_factory_impl.cc | 2 +- jingle/glue/proxy_resolving_client_socket.cc | 5 - net/cookies/cookie_monster.cc | 12 +-- net/http/http_network_transaction.cc | 104 +-------------------- net/http/http_proxy_client_socket_pool.cc | 5 - net/http/http_stream_factory_impl_job.cc | 4 - net/http/http_stream_parser.cc | 44 +-------- net/socket/client_socket_pool_base.cc | 5 - net/socket/socks_client_socket_pool.cc | 4 - net/socket/ssl_client_socket_pool.cc | 3 - 13 files changed, 23 insertions(+), 209 deletions(-) diff --git a/chrome/browser/safe_browsing/protocol_manager.cc b/chrome/browser/safe_browsing/protocol_manager.cc index e8b55e16883b..b1910d14b94f 100644 --- a/chrome/browser/safe_browsing/protocol_manager.cc +++ b/chrome/browser/safe_browsing/protocol_manager.cc @@ -8,6 +8,7 @@ #include "base/logging.h" #include "base/memory/scoped_vector.h" #include "base/metrics/histogram.h" +#include "base/profiler/scoped_tracker.h" #include "base/rand_util.h" #include "base/stl_util.h" #include "base/strings/string_util.h" @@ -94,6 +95,10 @@ SafeBrowsingProtocolManager* SafeBrowsingProtocolManager::Create( SafeBrowsingProtocolManagerDelegate* delegate, net::URLRequestContextGetter* request_context_getter, const SafeBrowsingProtocolConfig& config) { + // TODO(cbentzel): Remove ScopedTracker below once crbug.com/483689 is fixed. + tracked_objects::ScopedTracker tracking_profile( + FROM_HERE_WITH_EXPLICIT_FUNCTION( + "483689 SafeBrowsingProtocolManager::Create")); if (!factory_) factory_ = new SBProtocolManagerFactoryImpl(); return factory_->CreateProtocolManager( @@ -463,6 +468,10 @@ bool SafeBrowsingProtocolManager::HandleServiceResponse( void SafeBrowsingProtocolManager::Initialize() { DCHECK(CalledOnValidThread()); + // TODO(cbentzel): Remove ScopedTracker below once crbug.com/483689 is fixed. + tracked_objects::ScopedTracker tracking_profile( + FROM_HERE_WITH_EXPLICIT_FUNCTION( + "483689 SafeBrowsingProtocolManager::Initialize")); // Don't want to hit the safe browsing servers on build/chrome bots. scoped_ptr env(base::Environment::Create()); if (env->HasVar(env_vars::kHeadless)) diff --git a/chrome/browser/safe_browsing/safe_browsing_service.cc b/chrome/browser/safe_browsing/safe_browsing_service.cc index ede1c5281077..5a3813c70848 100644 --- a/chrome/browser/safe_browsing/safe_browsing_service.cc +++ b/chrome/browser/safe_browsing/safe_browsing_service.cc @@ -15,7 +15,6 @@ #include "base/path_service.h" #include "base/prefs/pref_change_registrar.h" #include "base/prefs/pref_service.h" -#include "base/profiler/scoped_tracker.h" #include "base/stl_util.h" #include "base/strings/string_util.h" #include "base/threading/thread.h" @@ -398,10 +397,6 @@ void SafeBrowsingService::RegisterAllDelayedAnalysis() { void SafeBrowsingService::InitURLRequestContextOnIOThread( net::URLRequestContextGetter* system_url_request_context_getter) { - // TODO(pkasting): Remove ScopedTracker below once crbug.com/455469 is fixed. - tracked_objects::ScopedTracker tracking_profile1( - FROM_HERE_WITH_EXPLICIT_FUNCTION( - "455469 SafeBrowsingService::InitURLRequestContextOnIOThread 1")); DCHECK_CURRENTLY_ON(BrowserThread::IO); DCHECK(!url_request_context_.get()); @@ -413,10 +408,6 @@ void SafeBrowsingService::InitURLRequestContextOnIOThread( NULL, NULL))); - // TODO(pkasting): Remove ScopedTracker below once crbug.com/455469 is fixed. - tracked_objects::ScopedTracker tracking_profile2( - FROM_HERE_WITH_EXPLICIT_FUNCTION( - "455469 SafeBrowsingService::InitURLRequestContextOnIOThread 2")); url_request_context_.reset(new net::URLRequestContext); // |system_url_request_context_getter| may be NULL during tests. if (system_url_request_context_getter) { @@ -477,10 +468,6 @@ SafeBrowsingProtocolConfig SafeBrowsingService::GetProtocolConfig() const { void SafeBrowsingService::StartOnIOThread( net::URLRequestContextGetter* url_request_context_getter) { - // TODO(pkasting): Remove ScopedTracker below once crbug.com/455469 is fixed. - tracked_objects::ScopedTracker tracking_profile1( - FROM_HERE_WITH_EXPLICIT_FUNCTION( - "455469 SafeBrowsingService::StartOnIOThread 1")); DCHECK_CURRENTLY_ON(BrowserThread::IO); if (enabled_) return; @@ -489,28 +476,15 @@ void SafeBrowsingService::StartOnIOThread( SafeBrowsingProtocolConfig config = GetProtocolConfig(); #if defined(SAFE_BROWSING_DB_LOCAL) - // TODO(pkasting): Remove ScopedTracker below once crbug.com/455469 is fixed. - tracked_objects::ScopedTracker tracking_profile2( - FROM_HERE_WITH_EXPLICIT_FUNCTION( - "455469 SafeBrowsingService::StartOnIOThread 2")); - DCHECK(database_manager_.get()); database_manager_->StartOnIOThread(); - // TODO(pkasting): Remove ScopedTracker below once crbug.com/455469 is fixed. - tracked_objects::ScopedTracker tracking_profile3( - FROM_HERE_WITH_EXPLICIT_FUNCTION( - "455469 SafeBrowsingService::StartOnIOThread 3")); DCHECK(!protocol_manager_); protocol_manager_ = SafeBrowsingProtocolManager::Create( database_manager_.get(), url_request_context_getter, config); protocol_manager_->Initialize(); #endif - // TODO(pkasting): Remove ScopedTracker below once crbug.com/455469 is fixed. - tracked_objects::ScopedTracker tracking_profile4( - FROM_HERE_WITH_EXPLICIT_FUNCTION( - "455469 SafeBrowsingService::StartOnIOThread 4")); DCHECK(!ping_manager_); ping_manager_ = SafeBrowsingPingManager::Create( url_request_context_getter, config); diff --git a/content/browser/net/sqlite_persistent_cookie_store.cc b/content/browser/net/sqlite_persistent_cookie_store.cc index 61cb32946394..e859f0babc8b 100644 --- a/content/browser/net/sqlite_persistent_cookie_store.cc +++ b/content/browser/net/sqlite_persistent_cookie_store.cc @@ -580,11 +580,6 @@ void SQLitePersistentCookieStore::Backend::ReportMetrics() { void SQLitePersistentCookieStore::Backend::CompleteLoadInForeground( const LoadedCallback& loaded_callback, bool load_success) { - // TODO(pkasting): Remove ScopedTracker below once crbug.com/457528 is fixed. - tracked_objects::ScopedTracker tracking_profile( - FROM_HERE_WITH_EXPLICIT_FUNCTION( - "457528 " - "SQLitePersistentCookieStore::Backend::CompleteLoadInForeground")); Notify(loaded_callback, load_success); if (load_success) @@ -1414,6 +1409,10 @@ CookieStoreConfig::~CookieStoreConfig() { } net::CookieStore* CreateCookieStore(const CookieStoreConfig& config) { + // TODO(bcwhite): Remove ScopedTracker below once crbug.com/483686 is fixed. + tracked_objects::ScopedTracker tracking_profile( + FROM_HERE_WITH_EXPLICIT_FUNCTION("483686 content::CreateCookieStore")); + net::CookieMonster* cookie_monster = NULL; if (config.path.empty()) { diff --git a/google_apis/gcm/engine/connection_factory_impl.cc b/google_apis/gcm/engine/connection_factory_impl.cc index ec2fdea743e3..b708edf869f7 100644 --- a/google_apis/gcm/engine/connection_factory_impl.cc +++ b/google_apis/gcm/engine/connection_factory_impl.cc @@ -350,7 +350,7 @@ base::TimeTicks ConnectionFactoryImpl::NowTicks() { } void ConnectionFactoryImpl::OnConnectDone(int result) { - // TODO(pkasting): Remove ScopedTracker below once crbug.com/455884 is fixed. + // TODO(zea): Remove ScopedTracker below once crbug.com/455884 is fixed. tracked_objects::ScopedTracker tracking_profile( FROM_HERE_WITH_EXPLICIT_FUNCTION( "455884 ConnectionFactoryImpl::OnConnectDone")); diff --git a/jingle/glue/proxy_resolving_client_socket.cc b/jingle/glue/proxy_resolving_client_socket.cc index 456e100aa1f0..5a6e068e1300 100644 --- a/jingle/glue/proxy_resolving_client_socket.cc +++ b/jingle/glue/proxy_resolving_client_socket.cc @@ -9,7 +9,6 @@ #include "base/bind_helpers.h" #include "base/compiler_specific.h" #include "base/logging.h" -#include "base/profiler/scoped_tracker.h" #include "net/base/io_buffer.h" #include "net/base/load_flags.h" #include "net/base/net_errors.h" @@ -213,10 +212,6 @@ void ProxyResolvingClientSocket::ProcessProxyResolveDone(int status) { } void ProxyResolvingClientSocket::ProcessConnectDone(int status) { - // TODO(pkasting): Remove ScopedTracker below once crbug.com/455884 is fixed. - tracked_objects::ScopedTracker tracking_profile( - FROM_HERE_WITH_EXPLICIT_FUNCTION( - "455884 ProxyResolvingClientSocket::OnConnectDone")); if (status != net::OK) { // If the connection fails, try another proxy. status = ReconsiderProxyAfterError(status); diff --git a/net/cookies/cookie_monster.cc b/net/cookies/cookie_monster.cc index 4f9b8d78be9a..8067a17ba543 100644 --- a/net/cookies/cookie_monster.cc +++ b/net/cookies/cookie_monster.cc @@ -1502,15 +1502,9 @@ void CookieMonster::InitStore() { void CookieMonster::OnLoaded(TimeTicks beginning_time, const std::vector& cookies) { - // TODO(pkasting): Remove ScopedTracker below once crbug.com/457528 is fixed. - tracked_objects::ScopedTracker tracking_profile1( - FROM_HERE_WITH_EXPLICIT_FUNCTION("457528 CookieMonster::OnLoaded 1")); StoreLoadedCookies(cookies); histogram_time_blocked_on_load_->AddTime(TimeTicks::Now() - beginning_time); - // TODO(pkasting): Remove ScopedTracker below once crbug.com/457528 is fixed. - tracked_objects::ScopedTracker tracking_profile2( - FROM_HERE_WITH_EXPLICIT_FUNCTION("457528 CookieMonster::OnLoaded 2")); // Invoke the task queue of cookie request. InvokeQueue(); } @@ -1552,6 +1546,12 @@ void CookieMonster::OnKeyLoaded(const std::string& key, void CookieMonster::StoreLoadedCookies( const std::vector& cookies) { + // TODO(erikwright): Remove ScopedTracker below once crbug.com/457528 is + // fixed. + tracked_objects::ScopedTracker tracking_profile( + FROM_HERE_WITH_EXPLICIT_FUNCTION( + "457528 CookieMonster::StoreLoadedCookies")); + // Initialize the store and sync in any saved persistent cookies. We don't // care if it's expired, insert it so it can be garbage collected, removed, // and sync'd. diff --git a/net/http/http_network_transaction.cc b/net/http/http_network_transaction.cc index 9bf323d99c9a..2de13999794b 100644 --- a/net/http/http_network_transaction.cc +++ b/net/http/http_network_transaction.cc @@ -616,11 +616,6 @@ void HttpNetworkTransaction::OnIOComplete(int result) { } int HttpNetworkTransaction::DoLoop(int result) { - // TODO(pkasting): Remove ScopedTracker below once crbug.com/424359 is fixed. - tracked_objects::ScopedTracker tracking_profile( - FROM_HERE_WITH_EXPLICIT_FUNCTION( - "424359 HttpNetworkTransaction::DoLoop")); - DCHECK(next_state_ != STATE_NONE); int rv = result; @@ -726,11 +721,6 @@ int HttpNetworkTransaction::DoLoop(int result) { } int HttpNetworkTransaction::DoNotifyBeforeCreateStream() { - // TODO(pkasting): Remove ScopedTracker below once crbug.com/424359 is fixed. - tracked_objects::ScopedTracker tracking_profile( - FROM_HERE_WITH_EXPLICIT_FUNCTION( - "424359 HttpNetworkTransaction::DoNotifyBeforeCreateStream")); - next_state_ = STATE_CREATE_STREAM; bool defer = false; if (!before_network_start_callback_.is_null()) @@ -741,7 +731,7 @@ int HttpNetworkTransaction::DoNotifyBeforeCreateStream() { } int HttpNetworkTransaction::DoCreateStream() { - // TODO(pkasting): Remove ScopedTracker below once crbug.com/424359 is fixed. + // TODO(mmenke): Remove ScopedTracker below once crbug.com/424359 is fixed. tracked_objects::ScopedTracker tracking_profile( FROM_HERE_WITH_EXPLICIT_FUNCTION( "424359 HttpNetworkTransaction::DoCreateStream")); @@ -773,11 +763,6 @@ int HttpNetworkTransaction::DoCreateStream() { } int HttpNetworkTransaction::DoCreateStreamComplete(int result) { - // TODO(pkasting): Remove ScopedTracker below once crbug.com/424359 is fixed. - tracked_objects::ScopedTracker tracking_profile( - FROM_HERE_WITH_EXPLICIT_FUNCTION( - "424359 HttpNetworkTransaction::DoCreateStreamComplete")); - // If |result| is ERR_HTTPS_PROXY_TUNNEL_RESPONSE, then // DoCreateStreamComplete is being called from OnHttpsProxyTunnelResponse, // which resets the stream request first. Therefore, we have to grab the @@ -809,22 +794,12 @@ int HttpNetworkTransaction::DoCreateStreamComplete(int result) { } int HttpNetworkTransaction::DoInitStream() { - // TODO(pkasting): Remove ScopedTracker below once crbug.com/424359 is fixed. - tracked_objects::ScopedTracker tracking_profile( - FROM_HERE_WITH_EXPLICIT_FUNCTION( - "424359 HttpNetworkTransaction::DoInitStream")); - DCHECK(stream_.get()); next_state_ = STATE_INIT_STREAM_COMPLETE; return stream_->InitializeStream(request_, priority_, net_log_, io_callback_); } int HttpNetworkTransaction::DoInitStreamComplete(int result) { - // TODO(pkasting): Remove ScopedTracker below once crbug.com/424359 is fixed. - tracked_objects::ScopedTracker tracking_profile( - FROM_HERE_WITH_EXPLICIT_FUNCTION( - "424359 HttpNetworkTransaction::DoInitStreamComplete")); - if (result == OK) { next_state_ = STATE_GENERATE_PROXY_AUTH_TOKEN; } else { @@ -841,11 +816,6 @@ int HttpNetworkTransaction::DoInitStreamComplete(int result) { } int HttpNetworkTransaction::DoGenerateProxyAuthToken() { - // TODO(pkasting): Remove ScopedTracker below once crbug.com/424359 is fixed. - tracked_objects::ScopedTracker tracking_profile( - FROM_HERE_WITH_EXPLICIT_FUNCTION( - "424359 HttpNetworkTransaction::DoGenerateProxyAuthToken")); - next_state_ = STATE_GENERATE_PROXY_AUTH_TOKEN_COMPLETE; if (!ShouldApplyProxyAuth()) return OK; @@ -862,11 +832,6 @@ int HttpNetworkTransaction::DoGenerateProxyAuthToken() { } int HttpNetworkTransaction::DoGenerateProxyAuthTokenComplete(int rv) { - // TODO(pkasting): Remove ScopedTracker below once crbug.com/424359 is fixed. - tracked_objects::ScopedTracker tracking_profile( - FROM_HERE_WITH_EXPLICIT_FUNCTION( - "424359 HttpNetworkTransaction::DoGenerateProxyAuthTokenComplete")); - DCHECK_NE(ERR_IO_PENDING, rv); if (rv == OK) next_state_ = STATE_GENERATE_SERVER_AUTH_TOKEN; @@ -874,11 +839,6 @@ int HttpNetworkTransaction::DoGenerateProxyAuthTokenComplete(int rv) { } int HttpNetworkTransaction::DoGenerateServerAuthToken() { - // TODO(pkasting): Remove ScopedTracker below once crbug.com/424359 is fixed. - tracked_objects::ScopedTracker tracking_profile( - FROM_HERE_WITH_EXPLICIT_FUNCTION( - "424359 HttpNetworkTransaction::DoGenerateServerAuthToken")); - next_state_ = STATE_GENERATE_SERVER_AUTH_TOKEN_COMPLETE; HttpAuth::Target target = HttpAuth::AUTH_SERVER; if (!auth_controllers_[target].get()) { @@ -898,11 +858,6 @@ int HttpNetworkTransaction::DoGenerateServerAuthToken() { } int HttpNetworkTransaction::DoGenerateServerAuthTokenComplete(int rv) { - // TODO(pkasting): Remove ScopedTracker below once crbug.com/424359 is fixed. - tracked_objects::ScopedTracker tracking_profile( - FROM_HERE_WITH_EXPLICIT_FUNCTION( - "424359 HttpNetworkTransaction::DoGenerateServerAuthTokenComplete")); - DCHECK_NE(ERR_IO_PENDING, rv); if (rv == OK) next_state_ = STATE_INIT_REQUEST_BODY; @@ -968,11 +923,6 @@ void HttpNetworkTransaction::BuildRequestHeaders( } int HttpNetworkTransaction::DoInitRequestBody() { - // TODO(pkasting): Remove ScopedTracker below once crbug.com/424359 is fixed. - tracked_objects::ScopedTracker tracking_profile( - FROM_HERE_WITH_EXPLICIT_FUNCTION( - "424359 HttpNetworkTransaction::DoInitRequestBody")); - next_state_ = STATE_INIT_REQUEST_BODY_COMPLETE; int rv = OK; if (request_->upload_data_stream) @@ -981,22 +931,12 @@ int HttpNetworkTransaction::DoInitRequestBody() { } int HttpNetworkTransaction::DoInitRequestBodyComplete(int result) { - // TODO(pkasting): Remove ScopedTracker below once crbug.com/424359 is fixed. - tracked_objects::ScopedTracker tracking_profile( - FROM_HERE_WITH_EXPLICIT_FUNCTION( - "424359 HttpNetworkTransaction::DoInitRequestBodyComplete")); - if (result == OK) next_state_ = STATE_BUILD_REQUEST; return result; } int HttpNetworkTransaction::DoBuildRequest() { - // TODO(pkasting): Remove ScopedTracker below once crbug.com/424359 is fixed. - tracked_objects::ScopedTracker tracking_profile( - FROM_HERE_WITH_EXPLICIT_FUNCTION( - "424359 HttpNetworkTransaction::DoBuildRequest")); - next_state_ = STATE_BUILD_REQUEST_COMPLETE; headers_valid_ = false; @@ -1011,18 +951,13 @@ int HttpNetworkTransaction::DoBuildRequest() { } int HttpNetworkTransaction::DoBuildRequestComplete(int result) { - // TODO(pkasting): Remove ScopedTracker below once crbug.com/424359 is fixed. - tracked_objects::ScopedTracker tracking_profile( - FROM_HERE_WITH_EXPLICIT_FUNCTION( - "424359 HttpNetworkTransaction::DoBuildRequestComplete")); - if (result == OK) next_state_ = STATE_SEND_REQUEST; return result; } int HttpNetworkTransaction::DoSendRequest() { - // TODO(pkasting): Remove ScopedTracker below once crbug.com/424359 is fixed. + // TODO(mmenke): Remove ScopedTracker below once crbug.com/424359 is fixed. tracked_objects::ScopedTracker tracking_profile( FROM_HERE_WITH_EXPLICIT_FUNCTION( "424359 HttpNetworkTransaction::DoSendRequest")); @@ -1034,11 +969,6 @@ int HttpNetworkTransaction::DoSendRequest() { } int HttpNetworkTransaction::DoSendRequestComplete(int result) { - // TODO(pkasting): Remove ScopedTracker below once crbug.com/424359 is fixed. - tracked_objects::ScopedTracker tracking_profile( - FROM_HERE_WITH_EXPLICIT_FUNCTION( - "424359 HttpNetworkTransaction::DoSendRequestComplete")); - send_end_time_ = base::TimeTicks::Now(); if (result < 0) return HandleIOError(result); @@ -1048,21 +978,11 @@ int HttpNetworkTransaction::DoSendRequestComplete(int result) { } int HttpNetworkTransaction::DoReadHeaders() { - // TODO(pkasting): Remove ScopedTracker below once crbug.com/424359 is fixed. - tracked_objects::ScopedTracker tracking_profile( - FROM_HERE_WITH_EXPLICIT_FUNCTION( - "424359 HttpNetworkTransaction::DoReadHeaders")); - next_state_ = STATE_READ_HEADERS_COMPLETE; return stream_->ReadResponseHeaders(io_callback_); } int HttpNetworkTransaction::DoReadHeadersComplete(int result) { - // TODO(pkasting): Remove ScopedTracker below once crbug.com/424359 is fixed. - tracked_objects::ScopedTracker tracking_profile( - FROM_HERE_WITH_EXPLICIT_FUNCTION( - "424359 HttpNetworkTransaction::DoReadHeadersComplete")); - // We can get a certificate error or ERR_SSL_CLIENT_AUTH_CERT_NEEDED here // due to SSL renegotiation. if (IsCertificateError(result)) { @@ -1164,11 +1084,6 @@ int HttpNetworkTransaction::DoReadHeadersComplete(int result) { } int HttpNetworkTransaction::DoReadBody() { - // TODO(pkasting): Remove ScopedTracker below once crbug.com/424359 is fixed. - tracked_objects::ScopedTracker tracking_profile( - FROM_HERE_WITH_EXPLICIT_FUNCTION( - "424359 HttpNetworkTransaction::DoReadBody")); - DCHECK(read_buf_.get()); DCHECK_GT(read_buf_len_, 0); DCHECK(stream_ != NULL); @@ -1179,11 +1094,6 @@ int HttpNetworkTransaction::DoReadBody() { } int HttpNetworkTransaction::DoReadBodyComplete(int result) { - // TODO(pkasting): Remove ScopedTracker below once crbug.com/424359 is fixed. - tracked_objects::ScopedTracker tracking_profile( - FROM_HERE_WITH_EXPLICIT_FUNCTION( - "424359 HttpNetworkTransaction::DoReadBodyComplete")); - // We are done with the Read call. bool done = false; if (result <= 0) { @@ -1229,11 +1139,6 @@ int HttpNetworkTransaction::DoReadBodyComplete(int result) { } int HttpNetworkTransaction::DoDrainBodyForAuthRestart() { - // TODO(pkasting): Remove ScopedTracker below once crbug.com/424359 is fixed. - tracked_objects::ScopedTracker tracking_profile( - FROM_HERE_WITH_EXPLICIT_FUNCTION( - "424359 HttpNetworkTransaction::DoDrainBodyForAuthRestart")); - // This method differs from DoReadBody only in the next_state_. So we just // call DoReadBody and override the next_state_. Perhaps there is a more // elegant way for these two methods to share code. @@ -1246,11 +1151,6 @@ int HttpNetworkTransaction::DoDrainBodyForAuthRestart() { // TODO(wtc): This method and the DoReadBodyComplete method are almost // the same. Figure out a good way for these two methods to share code. int HttpNetworkTransaction::DoDrainBodyForAuthRestartComplete(int result) { - // TODO(pkasting): Remove ScopedTracker below once crbug.com/424359 is fixed. - tracked_objects::ScopedTracker tracking_profile( - FROM_HERE_WITH_EXPLICIT_FUNCTION( - "424359 HttpNetworkTransaction::DoDrainBodyForAuthRestartComplete")); - // keep_alive defaults to true because the very reason we're draining the // response body is to reuse the connection for auth restart. bool done = false, keep_alive = true; diff --git a/net/http/http_proxy_client_socket_pool.cc b/net/http/http_proxy_client_socket_pool.cc index 9b9c382a9c00..6ea447c35690 100644 --- a/net/http/http_proxy_client_socket_pool.cc +++ b/net/http/http_proxy_client_socket_pool.cc @@ -7,7 +7,6 @@ #include #include "base/compiler_specific.h" -#include "base/profiler/scoped_tracker.h" #include "base/time/time.h" #include "base/values.h" #include "net/base/load_flags.h" @@ -127,10 +126,6 @@ void HttpProxyConnectJob::GetAdditionalErrorState(ClientSocketHandle * handle) { } void HttpProxyConnectJob::OnIOComplete(int result) { - // TODO(pkasting): Remove ScopedTracker below once crbug.com/455884 is fixed. - tracked_objects::ScopedTracker tracking_profile( - FROM_HERE_WITH_EXPLICIT_FUNCTION( - "455884 HttpProxyConnectJob::OnIOComplete")); int rv = DoLoop(result); if (rv != ERR_IO_PENDING) { NotifyProxyDelegateOfCompletion(rv); diff --git a/net/http/http_stream_factory_impl_job.cc b/net/http/http_stream_factory_impl_job.cc index b07a461e9b00..8910c8f96b52 100644 --- a/net/http/http_stream_factory_impl_job.cc +++ b/net/http/http_stream_factory_impl_job.cc @@ -449,10 +449,6 @@ int HttpStreamFactoryImpl::Job::OnHostResolution( } void HttpStreamFactoryImpl::Job::OnIOComplete(int result) { - // TODO(pkasting): Remove ScopedTracker below once crbug.com/455884 is fixed. - tracked_objects::ScopedTracker tracking_profile( - FROM_HERE_WITH_EXPLICIT_FUNCTION( - "455884 HttpStreamFactoryImpl::Job::OnIOComplete")); RunLoop(result); } diff --git a/net/http/http_stream_parser.cc b/net/http/http_stream_parser.cc index 30a63015496b..23208877a0f1 100644 --- a/net/http/http_stream_parser.cc +++ b/net/http/http_stream_parser.cc @@ -386,10 +386,6 @@ void HttpStreamParser::OnIOComplete(int result) { } int HttpStreamParser::DoLoop(int result) { - // TODO(pkasting): Remove ScopedTracker below once crbug.com/424359 is fixed. - tracked_objects::ScopedTracker tracking_profile( - FROM_HERE_WITH_EXPLICIT_FUNCTION("424359 HttpStreamParser::DoLoop")); - do { DCHECK_NE(ERR_IO_PENDING, result); DCHECK_NE(STATE_DONE, io_state_); @@ -442,7 +438,7 @@ int HttpStreamParser::DoLoop(int result) { } int HttpStreamParser::DoSendHeaders() { - // TODO(pkasting): Remove ScopedTracker below once crbug.com/424359 is fixed. + // TODO(mmenke): Remove ScopedTracker below once crbug.com/424359 is fixed. tracked_objects::ScopedTracker tracking_profile( FROM_HERE_WITH_EXPLICIT_FUNCTION( "424359 HttpStreamParser::DoSendHeaders")); @@ -461,11 +457,6 @@ int HttpStreamParser::DoSendHeaders() { } int HttpStreamParser::DoSendHeadersComplete(int result) { - // TODO(pkasting): Remove ScopedTracker below once crbug.com/424359 is fixed. - tracked_objects::ScopedTracker tracking_profile( - FROM_HERE_WITH_EXPLICIT_FUNCTION( - "424359 HttpStreamParser::DoSendHeadersComplete")); - if (result < 0) { // In the unlikely case that the headers and body were merged, all the // the headers were sent, but not all of the body way, and |result| is @@ -505,10 +496,6 @@ int HttpStreamParser::DoSendHeadersComplete(int result) { } int HttpStreamParser::DoSendBody() { - // TODO(pkasting): Remove ScopedTracker below once crbug.com/424359 is fixed. - tracked_objects::ScopedTracker tracking_profile( - FROM_HERE_WITH_EXPLICIT_FUNCTION("424359 HttpStreamParser::DoSendBody")); - if (request_body_send_buf_->BytesRemaining() > 0) { io_state_ = STATE_SEND_BODY_COMPLETE; return connection_->socket() @@ -530,11 +517,6 @@ int HttpStreamParser::DoSendBody() { } int HttpStreamParser::DoSendBodyComplete(int result) { - // TODO(pkasting): Remove ScopedTracker below once crbug.com/424359 is fixed. - tracked_objects::ScopedTracker tracking_profile( - FROM_HERE_WITH_EXPLICIT_FUNCTION( - "424359 HttpStreamParser::DoSendBodyComplete")); - if (result < 0) { // If |result| is an error that this should try reading after, stash the // error for now and act like the request was successfully sent. @@ -552,11 +534,6 @@ int HttpStreamParser::DoSendBodyComplete(int result) { } int HttpStreamParser::DoSendRequestReadBodyComplete(int result) { - // TODO(pkasting): Remove ScopedTracker below once crbug.com/424359 is fixed. - tracked_objects::ScopedTracker tracking_profile( - FROM_HERE_WITH_EXPLICIT_FUNCTION( - "424359 HttpStreamParser::DoSendRequestReadBodyComplete")); - // |result| is the result of read from the request body from the last call to // DoSendBody(). DCHECK_GE(result, 0); // There won't be errors. @@ -590,11 +567,6 @@ int HttpStreamParser::DoSendRequestReadBodyComplete(int result) { } int HttpStreamParser::DoReadHeaders() { - // TODO(pkasting): Remove ScopedTracker below once crbug.com/424359 is fixed. - tracked_objects::ScopedTracker tracking_profile( - FROM_HERE_WITH_EXPLICIT_FUNCTION( - "424359 HttpStreamParser::DoReadHeaders")); - io_state_ = STATE_READ_HEADERS_COMPLETE; // Grow the read buffer if necessary. @@ -610,11 +582,6 @@ int HttpStreamParser::DoReadHeaders() { } int HttpStreamParser::DoReadHeadersComplete(int result) { - // TODO(pkasting): Remove ScopedTracker below once crbug.com/424359 is fixed. - tracked_objects::ScopedTracker tracking_profile( - FROM_HERE_WITH_EXPLICIT_FUNCTION( - "424359 HttpStreamParser::DoReadHeadersComplete")); - result = HandleReadHeaderResult(result); // TODO(mmenke): The code below is ugly and hacky. A much better and more @@ -662,10 +629,6 @@ int HttpStreamParser::DoReadHeadersComplete(int result) { } int HttpStreamParser::DoReadBody() { - // TODO(pkasting): Remove ScopedTracker below once crbug.com/424359 is fixed. - tracked_objects::ScopedTracker tracking_profile( - FROM_HERE_WITH_EXPLICIT_FUNCTION("424359 HttpStreamParser::DoReadBody")); - io_state_ = STATE_READ_BODY_COMPLETE; // There may be some data left over from reading the response headers. @@ -699,11 +662,6 @@ int HttpStreamParser::DoReadBody() { } int HttpStreamParser::DoReadBodyComplete(int result) { - // TODO(pkasting): Remove ScopedTracker below once crbug.com/424359 is fixed. - tracked_objects::ScopedTracker tracking_profile( - FROM_HERE_WITH_EXPLICIT_FUNCTION( - "424359 HttpStreamParser::DoReadBodyComplete")); - // When the connection is closed, there are numerous ways to interpret it. // // - If a Content-Length header is present and the body contains exactly that diff --git a/net/socket/client_socket_pool_base.cc b/net/socket/client_socket_pool_base.cc index 3d0ff567b3a6..9cf25bbdb133 100644 --- a/net/socket/client_socket_pool_base.cc +++ b/net/socket/client_socket_pool_base.cc @@ -10,7 +10,6 @@ #include "base/format_macros.h" #include "base/logging.h" #include "base/message_loop/message_loop.h" -#include "base/profiler/scoped_tracker.h" #include "base/stl_util.h" #include "base/strings/string_util.h" #include "base/time/time.h" @@ -1125,10 +1124,6 @@ void ClientSocketPoolBaseHelper::InvokeUserCallbackLater( void ClientSocketPoolBaseHelper::InvokeUserCallback( ClientSocketHandle* handle) { - // TODO(pkasting): Remove ScopedTracker below once crbug.com/455884 is fixed. - tracked_objects::ScopedTracker tracking_profile( - FROM_HERE_WITH_EXPLICIT_FUNCTION( - "455884 ClientSocketPoolBaseHelper::InvokeUserCallback")); PendingCallbackMap::iterator it = pending_callback_map_.find(handle); // Exit if the request has already been cancelled. diff --git a/net/socket/socks_client_socket_pool.cc b/net/socket/socks_client_socket_pool.cc index 953c0c4d663a..ee613ac45794 100644 --- a/net/socket/socks_client_socket_pool.cc +++ b/net/socket/socks_client_socket_pool.cc @@ -6,7 +6,6 @@ #include "base/bind.h" #include "base/bind_helpers.h" -#include "base/profiler/scoped_tracker.h" #include "base/time/time.h" #include "base/values.h" #include "net/base/net_errors.h" @@ -77,9 +76,6 @@ LoadState SOCKSConnectJob::GetLoadState() const { } void SOCKSConnectJob::OnIOComplete(int result) { - // TODO(pkasting): Remove ScopedTracker below once crbug.com/455884 is fixed. - tracked_objects::ScopedTracker tracking_profile( - FROM_HERE_WITH_EXPLICIT_FUNCTION("455884 SOCKSConnectJob::OnIOComplete")); int rv = DoLoop(result); if (rv != ERR_IO_PENDING) NotifyDelegateOfCompletion(rv); // Deletes |this| diff --git a/net/socket/ssl_client_socket_pool.cc b/net/socket/ssl_client_socket_pool.cc index e0a7e3be237f..11de9193e579 100644 --- a/net/socket/ssl_client_socket_pool.cc +++ b/net/socket/ssl_client_socket_pool.cc @@ -168,9 +168,6 @@ void SSLConnectJob::GetAdditionalErrorState(ClientSocketHandle* handle) { } void SSLConnectJob::OnIOComplete(int result) { - // TODO(pkasting): Remove ScopedTracker below once crbug.com/455884 is fixed. - tracked_objects::ScopedTracker tracking_profile( - FROM_HERE_WITH_EXPLICIT_FUNCTION("455884 SSLConnectJob::OnIOComplete")); int rv = DoLoop(result); if (rv != ERR_IO_PENDING) NotifyDelegateOfCompletion(rv); // Deletes |this|. -- 2.11.4.GIT