summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpkasting <pkasting@chromium.org>2015-04-07 21:42:12 -0700
committerCommit bot <commit-bot@chromium.org>2015-04-08 04:42:40 +0000
commit379234c28f3856045a67af657296d6911156bbff (patch)
treec0d7f0cab2fb491b97efec10fc8c444c49fc1ade
parent8f0f3b63b8fd45d72ab957bdc12c714899199a72 (diff)
downloadchromium_src-379234c28f3856045a67af657296d6911156bbff.zip
chromium_src-379234c28f3856045a67af657296d6911156bbff.tar.gz
chromium_src-379234c28f3856045a67af657296d6911156bbff.tar.bz2
Remove unnecessary instrumentation for several jank bugs.
BUG=437890,436671,455423,424386,436634,422516 TEST=none TBR=jochen,cbentzel,jyasskin Review URL: https://codereview.chromium.org/1062413002 Cr-Commit-Position: refs/heads/master@{#324185}
-rw-r--r--chrome/browser/devtools/device/port_forwarding_controller.cc5
-rw-r--r--chrome/browser/download/download_resource_throttle.cc6
-rw-r--r--chrome/browser/net/chrome_url_request_context_getter.cc29
-rw-r--r--chrome/browser/net/predictor.cc91
-rw-r--r--chrome/browser/profiles/off_the_record_profile_io_data.cc6
-rw-r--r--chrome/browser/profiles/profile_impl_io_data.cc72
-rw-r--r--chrome/browser/profiles/profile_io_data.cc25
-rw-r--r--chrome/browser/task_manager/browser_process_resource_provider.cc30
-rw-r--r--chrome/browser/task_manager/task_manager.cc47
-rw-r--r--components/domain_reliability/monitor.cc12
-rw-r--r--components/nacl/browser/pnacl_translation_cache.cc6
-rw-r--r--content/browser/appcache/appcache_response.cc2
-rw-r--r--content/browser/appcache/appcache_update_job.cc11
-rw-r--r--content/browser/cache_storage/cache_storage_cache.cc12
-rw-r--r--content/browser/fileapi/mock_url_request_delegate.cc11
-rw-r--r--content/browser/gpu/shader_disk_cache.cc26
-rw-r--r--content/browser/loader/power_save_block_resource_throttle.cc6
-rw-r--r--content/browser/renderer_host/p2p/socket_dispatcher_host.cc6
-rw-r--r--content/browser/renderer_host/pepper/pepper_lookup_request.h6
-rw-r--r--content/browser/renderer_host/pepper/pepper_tcp_socket_message_filter.cc5
-rw-r--r--extensions/browser/api/dns/dns_api.cc6
-rw-r--r--extensions/browser/api/socket/socket_api.cc6
-rw-r--r--net/base/net_util_win.cc36
-rw-r--r--net/base/network_change_notifier_win.cc6
-rw-r--r--net/cert/x509_certificate.cc2
-rw-r--r--net/disk_cache/blockfile/in_flight_backend_io.cc115
-rw-r--r--net/disk_cache/blockfile/in_flight_io.cc5
-rw-r--r--net/disk_cache/cache_creator.cc5
-rw-r--r--net/dns/host_resolver_impl.cc31
-rw-r--r--net/dns/single_request_host_resolver.cc6
-rw-r--r--net/ftp/ftp_network_transaction.cc6
-rw-r--r--net/http/disk_based_cert_cache.cc6
-rw-r--r--net/http/disk_cache_based_quic_server_info.cc66
-rw-r--r--net/http/http_auth_handler_negotiate.cc6
-rw-r--r--net/http/http_cache.cc6
-rw-r--r--net/http/http_cache_transaction.cc237
-rw-r--r--net/http/partial_data.cc6
-rw-r--r--net/proxy/proxy_resolver_v8_tracing.cc5
-rw-r--r--net/proxy/proxy_script_decider.cc5
-rw-r--r--net/quic/crypto/quic_crypto_client_config.cc6
-rw-r--r--net/quic/quic_crypto_client_stream.cc15
-rw-r--r--net/socket/client_socket_pool_base.cc6
-rw-r--r--net/socket/socks_client_socket.cc6
-rw-r--r--net/socket/ssl_client_socket_nss.cc51
-rw-r--r--net/socket/ssl_client_socket_openssl.cc69
-rw-r--r--net/socket/ssl_client_socket_pool.cc1
-rw-r--r--net/socket/ssl_session_cache_openssl.cc41
-rw-r--r--net/socket/tcp_client_socket.cc53
-rw-r--r--net/socket/tcp_socket_win.cc39
-rw-r--r--net/socket/transport_client_socket_pool.cc34
-rw-r--r--net/socket/transport_client_socket_pool.h12
-rw-r--r--net/socket/websocket_transport_client_socket_pool.cc6
-rw-r--r--net/ssl/openssl_platform_key_win.cc9
-rw-r--r--net/tools/dump_cache/simple_cache_dumper.cc6
-rw-r--r--net/url_request/view_cache_helper.cc5
55 files changed, 128 insertions, 1206 deletions
diff --git a/chrome/browser/devtools/device/port_forwarding_controller.cc b/chrome/browser/devtools/device/port_forwarding_controller.cc
index 7777672..cd7dc34 100644
--- a/chrome/browser/devtools/device/port_forwarding_controller.cc
+++ b/chrome/browser/devtools/device/port_forwarding_controller.cc
@@ -11,7 +11,6 @@
#include "base/memory/singleton.h"
#include "base/message_loop/message_loop.h"
#include "base/prefs/pref_service.h"
-#include "base/profiler/scoped_tracker.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_util.h"
#include "base/strings/stringprintf.h"
@@ -89,10 +88,6 @@ class SocketTunnel : public base::NonThreadSafe {
}
void OnResolved(int result) {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/436634 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION("436634 SocketTunnel::OnResolved"));
-
if (result < 0) {
SelfDestruct();
return;
diff --git a/chrome/browser/download/download_resource_throttle.cc b/chrome/browser/download/download_resource_throttle.cc
index e613ae9..a8e2afa 100644
--- a/chrome/browser/download/download_resource_throttle.cc
+++ b/chrome/browser/download/download_resource_throttle.cc
@@ -5,7 +5,6 @@
#include "chrome/browser/download/download_resource_throttle.h"
#include "base/bind.h"
-#include "base/profiler/scoped_tracker.h"
#include "chrome/browser/download/download_stats.h"
#include "content/public/browser/resource_controller.h"
@@ -41,11 +40,6 @@ void DownloadResourceThrottle::WillRedirectRequest(
}
void DownloadResourceThrottle::WillProcessResponse(bool* defer) {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422516 DownloadResourceThrottle::WillProcessResponse"));
-
WillDownload(defer);
}
diff --git a/chrome/browser/net/chrome_url_request_context_getter.cc b/chrome/browser/net/chrome_url_request_context_getter.cc
index 81f7519..ab3ed5d 100644
--- a/chrome/browser/net/chrome_url_request_context_getter.cc
+++ b/chrome/browser/net/chrome_url_request_context_getter.cc
@@ -8,7 +8,6 @@
#include "base/compiler_specific.h"
#include "base/message_loop/message_loop.h"
#include "base/message_loop/message_loop_proxy.h"
-#include "base/profiler/scoped_tracker.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/io_thread.h"
#include "chrome/browser/profiles/profile.h"
@@ -50,10 +49,6 @@ class FactoryForMain : public ChromeURLRequestContextFactory {
}
net::URLRequestContext* Create() override {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/436671 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION("436671 FactoryForMain::Create"));
-
profile_io_data_->Init(&protocol_handlers_, request_interceptors_.Pass());
return profile_io_data_->GetMainRequestContext();
}
@@ -71,11 +66,6 @@ class FactoryForExtensions : public ChromeURLRequestContextFactory {
: profile_io_data_(profile_io_data) {}
net::URLRequestContext* Create() override {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/436671 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "436671 FactoryForExtensions::Create"));
-
return profile_io_data_->GetExtensionsRequestContext();
}
@@ -103,11 +93,6 @@ class FactoryForIsolatedApp : public ChromeURLRequestContextFactory {
}
net::URLRequestContext* Create() override {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/436671 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "436671 FactoryForIsolatedApp::Create"));
-
// We will copy most of the state from the main request context.
//
// Note that this factory is one-shot. After Create() is called once, the
@@ -145,11 +130,6 @@ class FactoryForIsolatedMedia : public ChromeURLRequestContextFactory {
app_context_getter_(app_context) {}
net::URLRequestContext* Create() override {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/436671 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "436671 FactoryForIsolatedMedia::Create"));
-
// We will copy most of the state from the corresopnding app's
// request context. We expect to have the same lifetime as
// the associated |app_context_getter_| so we can just reuse
@@ -174,10 +154,6 @@ class FactoryForMedia : public ChromeURLRequestContextFactory {
}
net::URLRequestContext* Create() override {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/436671 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION("436671 FactoryForMedia::Create"));
-
return profile_io_data_->GetMediaRequestContext();
}
@@ -203,11 +179,6 @@ ChromeURLRequestContextGetter::~ChromeURLRequestContextGetter() {}
// Lazily create a URLRequestContext using our factory.
net::URLRequestContext*
ChromeURLRequestContextGetter::GetURLRequestContext() {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/436671 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "436671 ChromeURLRequestContextGetter::GetURLRequestContext"));
-
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
if (factory_.get()) {
diff --git a/chrome/browser/net/predictor.cc b/chrome/browser/net/predictor.cc
index a64be9e..b135b2f 100644
--- a/chrome/browser/net/predictor.cc
+++ b/chrome/browser/net/predictor.cc
@@ -125,11 +125,6 @@ class Predictor::LookupRequest {
private:
void OnLookupFinished(int result) {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/436634 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "436634 Predictor::LookupRequest::OnLookupFinished"));
-
predictor_->OnLookupFinished(this, url_, result == net::OK);
}
@@ -443,10 +438,6 @@ void Predictor::DiscardAllResults() {
// Overloaded Resolve() to take a vector of names.
void Predictor::ResolveList(const UrlList& urls,
UrlInfo::ResolutionMotivation motivation) {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/436671 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION("436671 Predictor::ResolveList"));
-
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
for (UrlList::const_iterator it = urls.begin(); it < urls.end(); ++it) {
@@ -689,33 +680,18 @@ void Predictor::FinalizeInitializationOnIOThread(
base::ListValue* referral_list,
IOThread* io_thread,
ProfileIOData* profile_io_data) {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/436671 is fixed.
- tracked_objects::ScopedTracker tracking_profile1(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "436671 Predictor::FinalizeInitializationOnIOThread1"));
-
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
profile_io_data_ = profile_io_data;
initial_observer_.reset(new InitialObserver());
host_resolver_ = io_thread->globals()->host_resolver.get();
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/436671 is fixed.
- tracked_objects::ScopedTracker tracking_profile2(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "436671 Predictor::FinalizeInitializationOnIOThread2"));
-
net::URLRequestContext* context =
url_request_context_getter_->GetURLRequestContext();
transport_security_state_ = context->transport_security_state();
ssl_config_service_ = context->ssl_config_service();
proxy_service_ = context->proxy_service();
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/436671 is fixed.
- tracked_objects::ScopedTracker tracking_profile3(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "436671 Predictor::FinalizeInitializationOnIOThread3"));
-
// base::WeakPtrFactory instances need to be created and destroyed
// on the same thread. The predictor lives on the IO thread and will die
// from there so now that we're on the IO thread we need to properly
@@ -723,19 +699,9 @@ void Predictor::FinalizeInitializationOnIOThread(
// TODO(groby): Check if WeakPtrFactory has the same constraint.
weak_factory_.reset(new base::WeakPtrFactory<Predictor>(this));
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/436671 is fixed.
- tracked_objects::ScopedTracker tracking_profile4(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "436671 Predictor::FinalizeInitializationOnIOThread4"));
-
// Prefetch these hostnames on startup.
DnsPrefetchMotivatedList(startup_urls, UrlInfo::STARTUP_LIST_MOTIVATED);
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/436671 is fixed.
- tracked_objects::ScopedTracker tracking_profile5(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "436671 Predictor::FinalizeInitializationOnIOThread5"));
-
DeserializeReferrersThenDelete(referral_list);
}
@@ -776,11 +742,6 @@ void Predictor::DnsPrefetchList(const NameList& hostnames) {
void Predictor::DnsPrefetchMotivatedList(
const UrlList& urls,
UrlInfo::ResolutionMotivation motivation) {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/436671 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "436671 Predictor::DnsPrefetchMotivatedList"));
-
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI) ||
BrowserThread::CurrentlyOn(BrowserThread::IO));
if (!predictor_enabled_)
@@ -1059,11 +1020,6 @@ bool Predictor::WouldLikelyProxyURL(const GURL& url) {
UrlInfo* Predictor::AppendToResolutionQueue(
const GURL& url,
UrlInfo::ResolutionMotivation motivation) {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/436671 is fixed.
- tracked_objects::ScopedTracker tracking_profile1(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "436671 Predictor::AppendToResolutionQueue1"));
-
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
DCHECK(url.has_host());
@@ -1082,29 +1038,22 @@ UrlInfo* Predictor::AppendToResolutionQueue(
return NULL;
}
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/436671 is fixed.
- tracked_objects::ScopedTracker tracking_profile2(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "436671 Predictor::AppendToResolutionQueue2"));
+ bool would_likely_proxy;
+ {
+ // TODO(ttuttle): Remove ScopedTracker below once crbug.com/436671 is fixed.
+ tracked_objects::ScopedTracker tracking_profile(
+ FROM_HERE_WITH_EXPLICIT_FUNCTION("436671 WouldLikelyProxyURL()"));
+ would_likely_proxy = WouldLikelyProxyURL(url);
+ }
- if (WouldLikelyProxyURL(url)) {
+ if (would_likely_proxy) {
info->DLogResultsStats("DNS PrefetchForProxiedRequest");
return NULL;
}
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/436671 is fixed.
- tracked_objects::ScopedTracker tracking_profile3(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "436671 Predictor::AppendToResolutionQueue3"));
-
info->SetQueuedState(motivation);
work_queue_.Push(url, motivation);
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/436671 is fixed.
- tracked_objects::ScopedTracker tracking_profile4(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "436671 Predictor::AppendToResolutionQueue4"));
-
StartSomeQueuedResolutions();
return info;
}
@@ -1132,11 +1081,6 @@ void Predictor::StartSomeQueuedResolutions() {
while (!work_queue_.IsEmpty() &&
pending_lookups_.size() < max_concurrent_dns_lookups_) {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/436671 is fixed.
- tracked_objects::ScopedTracker tracking_profile1(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "436671 Predictor::StartSomeQueuedResolutions1"));
-
const GURL url(work_queue_.Pop());
UrlInfo* info = &results_[url];
DCHECK(info->HasUrl(url));
@@ -1149,17 +1093,14 @@ void Predictor::StartSomeQueuedResolutions() {
LookupRequest* request = new LookupRequest(this, host_resolver_, url);
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/436671 is fixed.
- tracked_objects::ScopedTracker tracking_profile2(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "436671 Predictor::StartSomeQueuedResolutions2"));
-
- int status = request->Start();
-
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/436671 is fixed.
- tracked_objects::ScopedTracker tracking_profile3(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "436671 Predictor::StartSomeQueuedResolutions3"));
+ int status;
+ {
+ // TODO(ttuttle): Remove ScopedTracker below once crbug.com/436671 is
+ // fixed.
+ tracked_objects::ScopedTracker tracking_profile(
+ FROM_HERE_WITH_EXPLICIT_FUNCTION("436671 LookupRequest::Start()"));
+ status = request->Start();
+ }
if (status == net::ERR_IO_PENDING) {
// Will complete asynchronously.
diff --git a/chrome/browser/profiles/off_the_record_profile_io_data.cc b/chrome/browser/profiles/off_the_record_profile_io_data.cc
index 53cf0dd..bd815f8 100644
--- a/chrome/browser/profiles/off_the_record_profile_io_data.cc
+++ b/chrome/browser/profiles/off_the_record_profile_io_data.cc
@@ -8,7 +8,6 @@
#include "base/command_line.h"
#include "base/logging.h"
#include "base/prefs/pref_service.h"
-#include "base/profiler/scoped_tracker.h"
#include "base/stl_util.h"
#include "base/threading/worker_pool.h"
#include "build/build_config.h"
@@ -201,11 +200,6 @@ void OffTheRecordProfileIOData::InitializeInternal(
ProfileParams* profile_params,
content::ProtocolHandlerMap* protocol_handlers,
content::URLRequestInterceptorScopedVector request_interceptors) const {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/436671 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "436671 OffTheRecordProfileIOData::InitializeInternal"));
-
net::URLRequestContext* main_context = main_request_context();
IOThread* const io_thread = profile_params->io_thread;
diff --git a/chrome/browser/profiles/profile_impl_io_data.cc b/chrome/browser/profiles/profile_impl_io_data.cc
index ae9af75..2d3c9cb 100644
--- a/chrome/browser/profiles/profile_impl_io_data.cc
+++ b/chrome/browser/profiles/profile_impl_io_data.cc
@@ -434,11 +434,6 @@ void ProfileImplIOData::InitializeInternal(
ProfileParams* profile_params,
content::ProtocolHandlerMap* protocol_handlers,
content::URLRequestInterceptorScopedVector request_interceptors) const {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/436671 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "436671 ProfileImplIOData::InitializeInternal"));
-
// Set up a persistent store for use by the network stack on the IO thread.
base::FilePath network_json_store_filepath(
profile_path_.Append(chrome::kNetworkPersistentStateFilename));
@@ -457,11 +452,6 @@ void ProfileImplIOData::InitializeInternal(
chrome_network_delegate->set_predictor(predictor_.get());
if (domain_reliability_monitor_) {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/436671 is fixed.
- tracked_objects::ScopedTracker tracking_profile1(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "436671 ProfileImplIOData::InitializeInternal1"));
-
domain_reliability::DomainReliabilityMonitor* monitor =
domain_reliability_monitor_.get();
monitor->InitURLRequestContext(main_context);
@@ -470,11 +460,6 @@ void ProfileImplIOData::InitializeInternal(
chrome_network_delegate->set_domain_reliability_monitor(monitor);
}
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/436671 is fixed.
- tracked_objects::ScopedTracker tracking_profile2(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "436671 ProfileImplIOData::InitializeInternal2"));
-
ApplyProfileParamsToContext(main_context);
if (http_server_properties_manager_)
@@ -509,12 +494,7 @@ void ProfileImplIOData::InitializeInternal(
scoped_refptr<net::CookieStore> cookie_store = NULL;
net::ChannelIDService* channel_id_service = NULL;
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/436671 is fixed.
- tracked_objects::ScopedTracker tracking_profile5(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "436671 ProfileImplIOData::InitializeInternal5"));
-
- // setup cookie store
+ // Set up cookie store.
if (!cookie_store.get()) {
DCHECK(!lazy_params_->cookie_path.empty());
@@ -530,12 +510,7 @@ void ProfileImplIOData::InitializeInternal(
main_context->set_cookie_store(cookie_store.get());
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/436671 is fixed.
- tracked_objects::ScopedTracker tracking_profile6(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "436671 ProfileImplIOData::InitializeInternal6"));
-
- // Setup server bound cert service.
+ // Set up server bound cert service.
if (!channel_id_service) {
DCHECK(!lazy_params_->channel_id_path.empty());
@@ -553,25 +528,20 @@ void ProfileImplIOData::InitializeInternal(
set_channel_id_service(channel_id_service);
main_context->set_channel_id_service(channel_id_service);
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/436671 is fixed.
- tracked_objects::ScopedTracker tracking_profile7(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "436671 ProfileImplIOData::InitializeInternal7"));
-
- net::HttpCache::DefaultBackend* main_backend =
- new net::HttpCache::DefaultBackend(
- net::DISK_CACHE,
- ChooseCacheBackendType(),
- lazy_params_->cache_path,
- lazy_params_->cache_max_size,
- BrowserThread::GetMessageLoopProxyForThread(BrowserThread::CACHE));
- scoped_ptr<net::HttpCache> main_cache = CreateMainHttpFactory(
- profile_params, main_backend);
-
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/436671 is fixed.
- tracked_objects::ScopedTracker tracking_profile71(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "436671 ProfileImplIOData::InitializeInternal71"));
+ scoped_ptr<net::HttpCache> main_cache;
+ {
+ // TODO(ttuttle): Remove ScopedTracker below once crbug.com/436671 is fixed.
+ tracked_objects::ScopedTracker tracking_profile(
+ FROM_HERE_WITH_EXPLICIT_FUNCTION("436671 HttpCache construction"));
+ net::HttpCache::DefaultBackend* main_backend =
+ new net::HttpCache::DefaultBackend(
+ net::DISK_CACHE,
+ ChooseCacheBackendType(),
+ lazy_params_->cache_path,
+ lazy_params_->cache_max_size,
+ BrowserThread::GetMessageLoopProxyForThread(BrowserThread::CACHE));
+ main_cache = CreateMainHttpFactory(profile_params, main_backend);
+ }
main_http_factory_.reset(main_cache.release());
main_context->set_http_transaction_factory(main_http_factory_.get());
@@ -581,11 +551,6 @@ void ProfileImplIOData::InitializeInternal(
new net::FtpNetworkLayer(io_thread_globals->host_resolver.get()));
#endif // !defined(DISABLE_FTP_SUPPORT)
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/436671 is fixed.
- tracked_objects::ScopedTracker tracking_profile8(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "436671 ProfileImplIOData::InitializeInternal8"));
-
scoped_ptr<net::URLRequestJobFactoryImpl> main_job_factory(
new net::URLRequestJobFactoryImpl());
InstallProtocolHandlers(main_job_factory.get(), protocol_handlers);
@@ -603,11 +568,6 @@ void ProfileImplIOData::InitializeInternal(
ftp_factory_.get());
main_context->set_job_factory(main_job_factory_.get());
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/436671 is fixed.
- tracked_objects::ScopedTracker tracking_profile9(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "436671 ProfileImplIOData::InitializeInternal9"));
-
#if defined(ENABLE_EXTENSIONS)
InitializeExtensionsRequestContext(profile_params);
#endif
diff --git a/chrome/browser/profiles/profile_io_data.cc b/chrome/browser/profiles/profile_io_data.cc
index 8457344..88ea1699 100644
--- a/chrome/browser/profiles/profile_io_data.cc
+++ b/chrome/browser/profiles/profile_io_data.cc
@@ -16,7 +16,6 @@
#include "base/logging.h"
#include "base/path_service.h"
#include "base/prefs/pref_service.h"
-#include "base/profiler/scoped_tracker.h"
#include "base/stl_util.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_util.h"
@@ -983,10 +982,6 @@ std::string ProfileIOData::GetSSLSessionCacheShard() {
void ProfileIOData::Init(
content::ProtocolHandlerMap* protocol_handlers,
content::URLRequestInterceptorScopedVector request_interceptors) const {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/436671 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION("436671 ProfileIOData::Init"));
-
// The basic logic is implemented here. The specific initialization
// is done in InitializeInternal(), implemented by subtypes. Static helper
// functions have been provided to assist in common operations.
@@ -1007,18 +1002,10 @@ void ProfileIOData::Init(
const base::CommandLine& command_line =
*base::CommandLine::ForCurrentProcess();
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/436671 is fixed.
- tracked_objects::ScopedTracker tracking_profile1(
- FROM_HERE_WITH_EXPLICIT_FUNCTION("436671 ProfileIOData::Init1"));
-
// Create the common request contexts.
main_request_context_.reset(new net::URLRequestContext());
extensions_request_context_.reset(new net::URLRequestContext());
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/436671 is fixed.
- tracked_objects::ScopedTracker tracking_profile2(
- FROM_HERE_WITH_EXPLICIT_FUNCTION("436671 ProfileIOData::Init2"));
-
scoped_ptr<ChromeNetworkDelegate> network_delegate(
new ChromeNetworkDelegate(
#if defined(ENABLE_EXTENSIONS)
@@ -1045,10 +1032,6 @@ void ProfileIOData::Init(
new chrome_browser_net::ChromeFraudulentCertificateReporter(
main_request_context_.get()));
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/436671 is fixed.
- tracked_objects::ScopedTracker tracking_profile3(
- FROM_HERE_WITH_EXPLICIT_FUNCTION("436671 ProfileIOData::Init3"));
-
// NOTE: Proxy service uses the default io thread network delegate, not the
// delegate just created.
proxy_service_.reset(
@@ -1067,10 +1050,6 @@ void ProfileIOData::Init(
BrowserThread::GetMessageLoopProxyForThread(BrowserThread::FILE),
IsOffTheRecord()));
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/436671 is fixed.
- tracked_objects::ScopedTracker tracking_profile4(
- FROM_HERE_WITH_EXPLICIT_FUNCTION("436671 ProfileIOData::Init4"));
-
// Take ownership over these parameters.
cookie_settings_ = profile_params_->cookie_settings;
host_content_settings_map_ = profile_params_->host_content_settings_map;
@@ -1114,10 +1093,6 @@ void ProfileIOData::Init(
io_thread_globals->cert_verifier.get());
#endif
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/436671 is fixed.
- tracked_objects::ScopedTracker tracking_profile5(
- FROM_HERE_WITH_EXPLICIT_FUNCTION("436671 ProfileIOData::Init5"));
-
// Install the New Tab Page Interceptor.
if (profile_params_->new_tab_page_interceptor.get()) {
request_interceptors.push_back(
diff --git a/chrome/browser/task_manager/browser_process_resource_provider.cc b/chrome/browser/task_manager/browser_process_resource_provider.cc
index 72fcd1e9..319c817 100644
--- a/chrome/browser/task_manager/browser_process_resource_provider.cc
+++ b/chrome/browser/task_manager/browser_process_resource_provider.cc
@@ -33,25 +33,18 @@ gfx::ImageSkia* BrowserProcessResource::default_icon_ = NULL;
BrowserProcessResource::BrowserProcessResource()
: title_() {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/437890 is fixed.
- tracked_objects::ScopedTracker tracking_profile1(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "437890 BrowserProcessResource::BrowserProcessResource1"));
-
#if defined(OS_WIN)
if (!default_icon_) {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/437890 is fixed.
- tracked_objects::ScopedTracker tracking_profile2(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "437890 BrowserProcessResource::BrowserProcessResource2"));
+ // TODO(afakhry): Remove ScopedTracker below once crbug.com/437890 is fixed.
+ tracked_objects::ScopedTracker tracking_profile1(
+ FROM_HERE_WITH_EXPLICIT_FUNCTION("437890 GetAppIcon()"));
HICON icon = GetAppIcon();
if (icon) {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/437890 is
+ // TODO(afakhry): Remove ScopedTracker below once crbug.com/437890 is
// fixed.
- tracked_objects::ScopedTracker tracking_profile3(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "437890 BrowserProcessResource::BrowserProcessResource3"));
+ tracked_objects::ScopedTracker tracking_profile2(
+ FROM_HERE_WITH_EXPLICIT_FUNCTION("437890 CreateSkBitmapFromHICON()"));
scoped_ptr<SkBitmap> bitmap(IconUtil::CreateSkBitmapFromHICON(icon));
default_icon_ = new gfx::ImageSkia(gfx::ImageSkiaRep(*bitmap, 1.0f));
@@ -59,6 +52,10 @@ BrowserProcessResource::BrowserProcessResource()
}
#elif defined(OS_POSIX)
if (!default_icon_) {
+ // TODO(afakhry): Remove ScopedTracker below once crbug.com/437890 is fixed.
+ tracked_objects::ScopedTracker tracking_profile3(
+ FROM_HERE_WITH_EXPLICIT_FUNCTION("437890 POSIX icon construction"));
+
ResourceBundle& rb = ResourceBundle::GetSharedInstance();
default_icon_ = rb.GetImageSkiaNamed(IDR_PRODUCT_LOGO_16);
}
@@ -67,12 +64,9 @@ BrowserProcessResource::BrowserProcessResource()
NOTIMPLEMENTED();
#endif // defined(OS_WIN)
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/437890 is
- // fixed.
+ // TODO(afakhry): Remove ScopedTracker below once crbug.com/437890 is fixed.
tracked_objects::ScopedTracker tracking_profile4(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "437890 BrowserProcessResource::BrowserProcessResource4"));
-
+ FROM_HERE_WITH_EXPLICIT_FUNCTION("437890 MakeThreadSafe()"));
default_icon_->MakeThreadSafe();
}
diff --git a/chrome/browser/task_manager/task_manager.cc b/chrome/browser/task_manager/task_manager.cc
index c9df8ec..9ca0de7 100644
--- a/chrome/browser/task_manager/task_manager.cc
+++ b/chrome/browser/task_manager/task_manager.cc
@@ -242,79 +242,32 @@ TaskManagerModel::TaskManagerModel(TaskManager* task_manager)
listen_requests_(0),
update_state_(IDLE),
is_updating_byte_count_(false) {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/437890 is fixed.
- tracked_objects::ScopedTracker tracking_profile1(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "437890 TaskManagerModel::TaskManagerModel1"));
-
AddResourceProvider(
new task_manager::BrowserProcessResourceProvider(task_manager));
-
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/437890 is fixed.
- tracked_objects::ScopedTracker tracking_profile2(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "437890 TaskManagerModel::TaskManagerModel2"));
-
AddResourceProvider(new task_manager::WebContentsResourceProvider(
task_manager,
scoped_ptr<WebContentsInformation>(
new task_manager::BackgroundInformation())));
-
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/437890 is fixed.
- tracked_objects::ScopedTracker tracking_profile3(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "437890 TaskManagerModel::TaskManagerModel3"));
-
AddResourceProvider(new task_manager::WebContentsResourceProvider(
task_manager,
scoped_ptr<WebContentsInformation>(
new task_manager::TabContentsInformation())));
#if defined(ENABLE_PRINT_PREVIEW)
-
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/437890 is fixed.
- tracked_objects::ScopedTracker tracking_profile4(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "437890 TaskManagerModel::TaskManagerModel4"));
-
AddResourceProvider(new task_manager::WebContentsResourceProvider(
task_manager,
scoped_ptr<WebContentsInformation>(
new task_manager::PrintingInformation())));
#endif // ENABLE_PRINT_PREVIEW
-
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/437890 is fixed.
- tracked_objects::ScopedTracker tracking_profile5(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "437890 TaskManagerModel::TaskManagerModel5"));
-
AddResourceProvider(new task_manager::WebContentsResourceProvider(
task_manager,
scoped_ptr<WebContentsInformation>(
new task_manager::PanelInformation())));
-
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/437890 is fixed.
- tracked_objects::ScopedTracker tracking_profile6(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "437890 TaskManagerModel::TaskManagerModel6"));
-
AddResourceProvider(
new task_manager::ChildProcessResourceProvider(task_manager));
-
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/437890 is fixed.
- tracked_objects::ScopedTracker tracking_profile7(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "437890 TaskManagerModel::TaskManagerModel7"));
-
AddResourceProvider(new task_manager::WebContentsResourceProvider(
task_manager,
scoped_ptr<WebContentsInformation>(
new task_manager::ExtensionInformation())));
-
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/437890 is fixed.
- tracked_objects::ScopedTracker tracking_profile8(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "437890 TaskManagerModel::TaskManagerModel8"));
-
AddResourceProvider(new task_manager::WebContentsResourceProvider(
task_manager,
scoped_ptr<WebContentsInformation>(
diff --git a/components/domain_reliability/monitor.cc b/components/domain_reliability/monitor.cc
index c3a00ab..bd86ad9 100644
--- a/components/domain_reliability/monitor.cc
+++ b/components/domain_reliability/monitor.cc
@@ -76,11 +76,6 @@ void DomainReliabilityMonitor::MoveToNetworkThread() {
void DomainReliabilityMonitor::InitURLRequestContext(
net::URLRequestContext* url_request_context) {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/436671 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "436671 DomainReliabilityMonitor::InitURLRequestContext"));
-
DCHECK(OnNetworkThread());
DCHECK(moved_to_network_thread_);
@@ -106,7 +101,7 @@ void DomainReliabilityMonitor::InitURLRequestContext(
}
void DomainReliabilityMonitor::AddBakedInConfigs() {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/436671 is fixed.
+ // TODO(ttuttle): Remove ScopedTracker below once crbug.com/436671 is fixed.
tracked_objects::ScopedTracker tracking_profile(
FROM_HERE_WITH_EXPLICIT_FUNCTION(
"436671 DomainReliabilityMonitor::AddBakedInConfigs"));
@@ -196,11 +191,6 @@ DomainReliabilityContext* DomainReliabilityMonitor::AddContextForTesting(
scoped_ptr<const DomainReliabilityConfig> config) {
DCHECK(OnNetworkThread());
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/436671 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "436671 DomainReliabilityConfig::AddContextForConfig"));
-
return context_manager_.AddContextForConfig(config.Pass());
}
diff --git a/components/nacl/browser/pnacl_translation_cache.cc b/components/nacl/browser/pnacl_translation_cache.cc
index 5ab1d38..1ccce9c 100644
--- a/components/nacl/browser/pnacl_translation_cache.cc
+++ b/components/nacl/browser/pnacl_translation_cache.cc
@@ -9,7 +9,6 @@
#include "base/callback.h"
#include "base/files/file_path.h"
#include "base/logging.h"
-#include "base/profiler/scoped_tracker.h"
#include "base/strings/string_number_conversions.h"
#include "base/threading/thread_checker.h"
#include "components/nacl/common/pnacl_types.h"
@@ -241,11 +240,6 @@ void PnaclTranslationCacheEntry::Finish(int rv) {
}
void PnaclTranslationCacheEntry::DispatchNext(int rv) {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422516 PnaclTranslationCacheEntry::DispatchNext"));
-
DCHECK(thread_checker_.CalledOnValidThread());
if (!cache_)
return;
diff --git a/content/browser/appcache/appcache_response.cc b/content/browser/appcache/appcache_response.cc
index d53f941..8b7c218 100644
--- a/content/browser/appcache/appcache_response.cc
+++ b/content/browser/appcache/appcache_response.cc
@@ -127,7 +127,7 @@ void AppCacheResponseIO::WriteRaw(int index, int offset,
}
void AppCacheResponseIO::OnRawIOComplete(int result) {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed.
+ // TODO(rtenneti): Remove ScopedTracker below once crbug.com/422516 is fixed.
tracked_objects::ScopedTracker tracking_profile(
FROM_HERE_WITH_EXPLICIT_FUNCTION(
"422516 AppCacheResponseIO::OnRawIOComplete"));
diff --git a/content/browser/appcache/appcache_update_job.cc b/content/browser/appcache/appcache_update_job.cc
index f36a2ec..b5d29a9 100644
--- a/content/browser/appcache/appcache_update_job.cc
+++ b/content/browser/appcache/appcache_update_job.cc
@@ -8,7 +8,6 @@
#include "base/bind_helpers.h"
#include "base/compiler_specific.h"
#include "base/message_loop/message_loop.h"
-#include "base/profiler/scoped_tracker.h"
#include "base/strings/string_util.h"
#include "base/strings/stringprintf.h"
#include "content/browser/appcache/appcache_group.h"
@@ -153,11 +152,6 @@ void AppCacheUpdateJob::URLFetcher::OnReceivedRedirect(
void AppCacheUpdateJob::URLFetcher::OnResponseStarted(
net::URLRequest *request) {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422516 AppCacheUpdateJob::URLFetcher::OnResponseStarted"));
-
DCHECK(request == request_);
int response_code = -1;
if (request->status().is_success()) {
@@ -217,11 +211,6 @@ void AppCacheUpdateJob::URLFetcher::OnResponseStarted(
void AppCacheUpdateJob::URLFetcher::OnReadCompleted(
net::URLRequest* request, int bytes_read) {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422516 AppCacheUpdateJob::URLFetcher::OnReadCompleted"));
-
DCHECK(request_ == request);
bool data_consumed = true;
if (request->status().is_success() && bytes_read > 0) {
diff --git a/content/browser/cache_storage/cache_storage_cache.cc b/content/browser/cache_storage/cache_storage_cache.cc
index c1dd98b..4dae870 100644
--- a/content/browser/cache_storage/cache_storage_cache.cc
+++ b/content/browser/cache_storage/cache_storage_cache.cc
@@ -138,11 +138,8 @@ void ReadMetadata(disk_cache::Entry* entry, const MetadataCallback& callback) {
net::CompletionCallback read_header_callback =
base::Bind(ReadMetadataDidReadMetadata, entry, callback, buffer);
- int read_rv = entry->ReadData(
- INDEX_HEADERS, 0, buffer.get(), buffer->size(),
- tracked_objects::ScopedTracker::TrackCallback(
- FROM_HERE_WITH_EXPLICIT_FUNCTION("422516 ReadMetadata"),
- read_header_callback));
+ int read_rv = entry->ReadData(INDEX_HEADERS, 0, buffer.get(), buffer->size(),
+ read_header_callback);
if (read_rv != net::ERR_IO_PENDING)
read_header_callback.Run(read_rv);
@@ -717,11 +714,6 @@ void CacheStorageCache::MatchDidReadMetadata(
void CacheStorageCache::MatchDidReadResponseBodyData(
scoped_ptr<MatchContext> match_context,
int rv) {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422516 CacheStorageCache::MatchDidReadResponseBodyData"));
-
if (rv < 0) {
match_context->original_callback.Run(CacheStorageCache::ERROR_TYPE_STORAGE,
scoped_ptr<ServiceWorkerResponse>(),
diff --git a/content/browser/fileapi/mock_url_request_delegate.cc b/content/browser/fileapi/mock_url_request_delegate.cc
index 40a975a..455b458 100644
--- a/content/browser/fileapi/mock_url_request_delegate.cc
+++ b/content/browser/fileapi/mock_url_request_delegate.cc
@@ -4,7 +4,6 @@
#include "content/browser/fileapi/mock_url_request_delegate.h"
-#include "base/profiler/scoped_tracker.h"
#include "base/run_loop.h"
#include "net/base/io_buffer.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -23,11 +22,6 @@ MockURLRequestDelegate::~MockURLRequestDelegate() {
}
void MockURLRequestDelegate::OnResponseStarted(net::URLRequest* request) {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422516 MockURLRequestDelegate::OnResponseStarted"));
-
if (request->status().is_success()) {
EXPECT_TRUE(request->response_headers());
ReadSome(request);
@@ -38,11 +32,6 @@ void MockURLRequestDelegate::OnResponseStarted(net::URLRequest* request) {
void MockURLRequestDelegate::OnReadCompleted(net::URLRequest* request,
int bytes_read) {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422516 MockURLRequestDelegate::OnReadCompleted"));
-
if (bytes_read > 0)
ReceiveData(request, bytes_read);
else
diff --git a/content/browser/gpu/shader_disk_cache.cc b/content/browser/gpu/shader_disk_cache.cc
index 64b167f..6461f24 100644
--- a/content/browser/gpu/shader_disk_cache.cc
+++ b/content/browser/gpu/shader_disk_cache.cc
@@ -4,7 +4,6 @@
#include "content/browser/gpu/shader_disk_cache.h"
-#include "base/profiler/scoped_tracker.h"
#include "base/threading/thread_checker.h"
#include "content/browser/gpu/gpu_process_host.h"
#include "content/public/browser/browser_thread.h"
@@ -260,11 +259,6 @@ void ShaderDiskReadHelper::LoadCache() {
}
void ShaderDiskReadHelper::OnOpComplete(int rv) {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422516 ShaderDiskReadHelper::OnOpComplete"));
-
DCHECK(CalledOnValidThread());
if (!cache_.get())
return;
@@ -296,11 +290,6 @@ void ShaderDiskReadHelper::OnOpComplete(int rv) {
}
int ShaderDiskReadHelper::OpenNextEntry() {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422516 ShaderDiskReadHelper::OpenNextEntry"));
-
DCHECK(CalledOnValidThread());
// Called through OnOpComplete, so we know |cache_| is valid.
op_type_ = OPEN_NEXT_COMPLETE;
@@ -311,11 +300,6 @@ int ShaderDiskReadHelper::OpenNextEntry() {
}
int ShaderDiskReadHelper::OpenNextEntryComplete(int rv) {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422516 ShaderDiskReadHelper::OpenNextEntryComplete"));
-
DCHECK(CalledOnValidThread());
// Called through OnOpComplete, so we know |cache_| is valid.
if (rv == net::ERR_FAILED) {
@@ -338,11 +322,6 @@ int ShaderDiskReadHelper::OpenNextEntryComplete(int rv) {
}
int ShaderDiskReadHelper::ReadComplete(int rv) {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422516 ShaderDiskReadHelper::ReadComplete"));
-
DCHECK(CalledOnValidThread());
// Called through OnOpComplete, so we know |cache_| is valid.
if (rv && rv == buf_->size()) {
@@ -361,11 +340,6 @@ int ShaderDiskReadHelper::ReadComplete(int rv) {
}
int ShaderDiskReadHelper::IterationComplete(int rv) {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422516 ShaderDiskReadHelper::IterationComplete"));
-
DCHECK(CalledOnValidThread());
// Called through OnOpComplete, so we know |cache_| is valid.
iter_.reset();
diff --git a/content/browser/loader/power_save_block_resource_throttle.cc b/content/browser/loader/power_save_block_resource_throttle.cc
index 23f2002..42e0b0e 100644
--- a/content/browser/loader/power_save_block_resource_throttle.cc
+++ b/content/browser/loader/power_save_block_resource_throttle.cc
@@ -4,7 +4,6 @@
#include "content/browser/loader/power_save_block_resource_throttle.h"
-#include "base/profiler/scoped_tracker.h"
#include "content/public/browser/power_save_blocker.h"
namespace content {
@@ -30,11 +29,6 @@ void PowerSaveBlockResourceThrottle::WillStartRequest(bool* defer) {
}
void PowerSaveBlockResourceThrottle::WillProcessResponse(bool* defer) {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422516 PowerSaveBlockResourceThrottle::WillProcessResponse"));
-
// Stop blocking power save after request finishes.
power_save_blocker_.reset();
timer_.Stop();
diff --git a/content/browser/renderer_host/p2p/socket_dispatcher_host.cc b/content/browser/renderer_host/p2p/socket_dispatcher_host.cc
index 04a097e..724294f 100644
--- a/content/browser/renderer_host/p2p/socket_dispatcher_host.cc
+++ b/content/browser/renderer_host/p2p/socket_dispatcher_host.cc
@@ -5,7 +5,6 @@
#include "content/browser/renderer_host/p2p/socket_dispatcher_host.h"
#include "base/bind.h"
-#include "base/profiler/scoped_tracker.h"
#include "base/stl_util.h"
#include "content/browser/renderer_host/p2p/socket_host.h"
#include "content/common/p2p_messages.h"
@@ -69,11 +68,6 @@ class P2PSocketDispatcherHost::DnsRequest {
private:
void OnDone(int result) {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/436634 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "436634 P2PSocketDispatcherHost::DnsRequest::OnDone"));
-
net::IPAddressList list;
if (result != net::OK) {
LOG(ERROR) << "Failed to resolve address for " << host_name_
diff --git a/content/browser/renderer_host/pepper/pepper_lookup_request.h b/content/browser/renderer_host/pepper/pepper_lookup_request.h
index f5723e5..b36bd5e 100644
--- a/content/browser/renderer_host/pepper/pepper_lookup_request.h
+++ b/content/browser/renderer_host/pepper/pepper_lookup_request.h
@@ -7,7 +7,6 @@
#include "base/callback.h"
#include "base/memory/scoped_ptr.h"
-#include "base/profiler/scoped_tracker.h"
#include "net/base/address_list.h"
#include "net/base/net_errors.h"
#include "net/dns/host_resolver.h"
@@ -48,11 +47,6 @@ class PepperLookupRequest {
private:
void OnLookupFinished(int result) {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/436634 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "436634 PepperLookupRequest::OnLookupFinished"));
-
callback_.Run(result, addresses_, *bound_info_);
delete this;
}
diff --git a/content/browser/renderer_host/pepper/pepper_tcp_socket_message_filter.cc b/content/browser/renderer_host/pepper/pepper_tcp_socket_message_filter.cc
index 590ebc9..f29fc97 100644
--- a/content/browser/renderer_host/pepper/pepper_tcp_socket_message_filter.cc
+++ b/content/browser/renderer_host/pepper/pepper_tcp_socket_message_filter.cc
@@ -719,11 +719,6 @@ void PepperTCPSocketMessageFilter::DoListen(
void PepperTCPSocketMessageFilter::OnResolveCompleted(
const ppapi::host::ReplyMessageContext& context,
int net_result) {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/436634 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "436634 PepperTCPSocketMessageFilter::OnResolveCompleted"));
-
DCHECK_CURRENTLY_ON(BrowserThread::IO);
if (!state_.IsPending(TCPSocketState::CONNECT)) {
diff --git a/extensions/browser/api/dns/dns_api.cc b/extensions/browser/api/dns/dns_api.cc
index cf938d6..9d0341c 100644
--- a/extensions/browser/api/dns/dns_api.cc
+++ b/extensions/browser/api/dns/dns_api.cc
@@ -5,7 +5,6 @@
#include "extensions/browser/api/dns/dns_api.h"
#include "base/bind.h"
-#include "base/profiler/scoped_tracker.h"
#include "base/values.h"
#include "content/public/browser/browser_context.h"
#include "content/public/browser/browser_thread.h"
@@ -81,11 +80,6 @@ void DnsResolveFunction::RespondOnUIThread() {
}
void DnsResolveFunction::OnLookupFinished(int resolve_result) {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/436634 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "436634 DnsResolveFunction::OnLookupFinished"));
-
scoped_ptr<ResolveCallbackResolveInfo> resolve_info(
new ResolveCallbackResolveInfo());
resolve_info->result_code = resolve_result;
diff --git a/extensions/browser/api/socket/socket_api.cc b/extensions/browser/api/socket/socket_api.cc
index 74aee95..881ae6c 100644
--- a/extensions/browser/api/socket/socket_api.cc
+++ b/extensions/browser/api/socket/socket_api.cc
@@ -8,7 +8,6 @@
#include "base/bind.h"
#include "base/containers/hash_tables.h"
-#include "base/profiler/scoped_tracker.h"
#include "content/public/browser/browser_context.h"
#include "content/public/browser/resource_context.h"
#include "extensions/browser/api/dns/host_resolver_wrapper.h"
@@ -213,11 +212,6 @@ void SocketExtensionWithDnsLookupFunction::StartDnsLookup(
}
void SocketExtensionWithDnsLookupFunction::OnDnsLookup(int resolve_result) {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/436634 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "436634 SocketExtensionWithDnsLookupFunction::OnDnsLookup"));
-
if (resolve_result == net::OK) {
DCHECK(!addresses_->empty());
resolved_address_ = addresses_->front().ToStringWithoutPort();
diff --git a/net/base/net_util_win.cc b/net/base/net_util_win.cc
index 5cd4a42d..0889917 100644
--- a/net/base/net_util_win.cc
+++ b/net/base/net_util_win.cc
@@ -201,10 +201,6 @@ bool GetNetworkList(NetworkInterfaceList* networks, int policy) {
}
WifiPHYLayerProtocol GetWifiPHYLayerProtocol() {
- // TODO(rtenneti): Remove ScopedTracker below once crbug.com/422516 is fixed.
- tracked_objects::ScopedTracker tracking_profile1(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422516 net_util_win::GetWifiPHYLayerProtocol1"));
const internal::WlanApi& wlanapi = internal::WlanApi::GetInstance();
if (!wlanapi.initialized)
return WIFI_PHY_LAYER_PROTOCOL_NONE;
@@ -212,30 +208,24 @@ WifiPHYLayerProtocol GetWifiPHYLayerProtocol() {
internal::WlanHandle client;
DWORD cur_version = 0;
const DWORD kMaxClientVersion = 2;
- // TODO(rtenneti): Remove ScopedTracker below once crbug.com/422516 is fixed.
- tracked_objects::ScopedTracker tracking_profile2(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422516 net_util_win::GetWifiPHYLayerProtocol2"));
- DWORD result = wlanapi.OpenHandle(kMaxClientVersion, &cur_version, &client);
- if (result != ERROR_SUCCESS)
- return WIFI_PHY_LAYER_PROTOCOL_NONE;
+ {
+ // TODO(rtenneti): Remove ScopedTracker below once crbug.com/422516 is
+ // fixed.
+ tracked_objects::ScopedTracker tracking_profile(
+ FROM_HERE_WITH_EXPLICIT_FUNCTION("422516 OpenHandle()"));
+ DWORD result = wlanapi.OpenHandle(kMaxClientVersion, &cur_version, &client);
+ if (result != ERROR_SUCCESS)
+ return WIFI_PHY_LAYER_PROTOCOL_NONE;
+ }
- // TODO(rtenneti): Remove ScopedTracker below once crbug.com/422516 is fixed.
- tracked_objects::ScopedTracker tracking_profile3(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422516 net_util_win::GetWifiPHYLayerProtocol3"));
WLAN_INTERFACE_INFO_LIST* interface_list_ptr = NULL;
- result = wlanapi.enum_interfaces_func(client.Get(), NULL,
- &interface_list_ptr);
+ DWORD result =
+ wlanapi.enum_interfaces_func(client.Get(), NULL, &interface_list_ptr);
if (result != ERROR_SUCCESS)
return WIFI_PHY_LAYER_PROTOCOL_NONE;
scoped_ptr<WLAN_INTERFACE_INFO_LIST, internal::WlanApiDeleter> interface_list(
interface_list_ptr);
- // TODO(rtenneti): Remove ScopedTracker below once crbug.com/422516 is fixed.
- tracked_objects::ScopedTracker tracking_profile4(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422516 net_util_win::GetWifiPHYLayerProtocol4"));
// Assume at most one connected wifi interface.
WLAN_INTERFACE_INFO* info = NULL;
for (unsigned i = 0; i < interface_list->dwNumberOfItems; ++i) {
@@ -252,10 +242,6 @@ WifiPHYLayerProtocol GetWifiPHYLayerProtocol() {
WLAN_CONNECTION_ATTRIBUTES* conn_info_ptr;
DWORD conn_info_size = 0;
WLAN_OPCODE_VALUE_TYPE op_code;
- // TODO(rtenneti): Remove ScopedTracker below once crbug.com/422516 is fixed.
- tracked_objects::ScopedTracker tracking_profile5(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422516 net_util_win::GetWifiPHYLayerProtocol5"));
result = wlanapi.query_interface_func(
client.Get(), &info->InterfaceGuid, wlan_intf_opcode_current_connection,
NULL, &conn_info_size, reinterpret_cast<VOID**>(&conn_info_ptr),
diff --git a/net/base/network_change_notifier_win.cc b/net/base/network_change_notifier_win.cc
index 6204c4c..343af14 100644
--- a/net/base/network_change_notifier_win.cc
+++ b/net/base/network_change_notifier_win.cc
@@ -10,7 +10,6 @@
#include "base/bind.h"
#include "base/logging.h"
#include "base/metrics/histogram.h"
-#include "base/profiler/scoped_tracker.h"
#include "base/threading/thread.h"
#include "base/time/time.h"
#include "net/base/winsock_init.h"
@@ -208,11 +207,6 @@ NetworkChangeNotifierWin::RecomputeCurrentConnectionType() const {
NetworkChangeNotifier::ConnectionType
NetworkChangeNotifierWin::GetCurrentConnectionType() const {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422516 NetworkChangeNotifierWin::GetCurrentConnectionType"));
-
base::AutoLock auto_lock(last_computed_connection_type_lock_);
return last_computed_connection_type_;
}
diff --git a/net/cert/x509_certificate.cc b/net/cert/x509_certificate.cc
index 84b3348..a612fb0 100644
--- a/net/cert/x509_certificate.cc
+++ b/net/cert/x509_certificate.cc
@@ -263,7 +263,7 @@ X509Certificate* X509Certificate::CreateFromHandle(
// static
X509Certificate* X509Certificate::CreateFromDERCertChain(
const std::vector<base::StringPiece>& der_certs) {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/424386 is fixed.
+ // TODO(cbentzel): Remove ScopedTracker below once crbug.com/424386 is fixed.
tracked_objects::ScopedTracker tracking_profile(
FROM_HERE_WITH_EXPLICIT_FUNCTION(
"424386 X509Certificate::CreateFromDERCertChain"));
diff --git a/net/disk_cache/blockfile/in_flight_backend_io.cc b/net/disk_cache/blockfile/in_flight_backend_io.cc
index 5b3b904..28d7114 100644
--- a/net/disk_cache/blockfile/in_flight_backend_io.cc
+++ b/net/disk_cache/blockfile/in_flight_backend_io.cc
@@ -8,7 +8,6 @@
#include "base/bind_helpers.h"
#include "base/compiler_specific.h"
#include "base/logging.h"
-#include "base/profiler/scoped_tracker.h"
#include "base/single_thread_task_runner.h"
#include "net/base/net_errors.h"
#include "net/disk_cache/blockfile/backend_impl.h"
@@ -65,14 +64,8 @@ void BackendIO::OnDone(bool cancel) {
if (result() == net::OK) {
static_cast<EntryImpl*>(*entry_ptr_)->OnEntryCreated(backend_);
- if (cancel) {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is
- // fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION("422516 BackendIO::OnDone"));
-
+ if (cancel)
(*entry_ptr_)->Close();
- }
}
}
@@ -341,57 +334,35 @@ InFlightBackendIO::~InFlightBackendIO() {
}
void InFlightBackendIO::Init(const net::CompletionCallback& callback) {
- // TODO(vadimt): Remove wrapping the callback with
- // ScopedTracker::TrackCallback() once crbug.com/422516 is fixed.
- scoped_refptr<BackendIO> operation(new BackendIO(
- this, backend_,
- tracked_objects::ScopedTracker::TrackCallback(
- FROM_HERE_WITH_EXPLICIT_FUNCTION("422516 InFlightBackendIO::Init"),
- callback)));
+ scoped_refptr<BackendIO> operation(new BackendIO(this, backend_, callback));
operation->Init();
PostOperation(operation.get());
}
void InFlightBackendIO::OpenEntry(const std::string& key, Entry** entry,
const net::CompletionCallback& callback) {
- scoped_refptr<BackendIO> operation(new BackendIO(
- this, backend_, tracked_objects::ScopedTracker::TrackCallback(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422516 InFlightBackendIO::OpenEntry"),
- callback)));
+ scoped_refptr<BackendIO> operation(new BackendIO(this, backend_, callback));
operation->OpenEntry(key, entry);
PostOperation(operation.get());
}
void InFlightBackendIO::CreateEntry(const std::string& key, Entry** entry,
const net::CompletionCallback& callback) {
- scoped_refptr<BackendIO> operation(new BackendIO(
- this, backend_, tracked_objects::ScopedTracker::TrackCallback(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422516 InFlightBackendIO::CreateEntry"),
- callback)));
+ scoped_refptr<BackendIO> operation(new BackendIO(this, backend_, callback));
operation->CreateEntry(key, entry);
PostOperation(operation.get());
}
void InFlightBackendIO::DoomEntry(const std::string& key,
const net::CompletionCallback& callback) {
- scoped_refptr<BackendIO> operation(new BackendIO(
- this, backend_, tracked_objects::ScopedTracker::TrackCallback(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422516 InFlightBackendIO::DoomEntry"),
- callback)));
+ scoped_refptr<BackendIO> operation(new BackendIO(this, backend_, callback));
operation->DoomEntry(key);
PostOperation(operation.get());
}
void InFlightBackendIO::DoomAllEntries(
const net::CompletionCallback& callback) {
- scoped_refptr<BackendIO> operation(new BackendIO(
- this, backend_, tracked_objects::ScopedTracker::TrackCallback(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422516 InFlightBackendIO::DoomAllEntries"),
- callback)));
+ scoped_refptr<BackendIO> operation(new BackendIO(this, backend_, callback));
operation->DoomAllEntries();
PostOperation(operation.get());
}
@@ -399,22 +370,14 @@ void InFlightBackendIO::DoomAllEntries(
void InFlightBackendIO::DoomEntriesBetween(const base::Time initial_time,
const base::Time end_time,
const net::CompletionCallback& callback) {
- scoped_refptr<BackendIO> operation(new BackendIO(
- this, backend_, tracked_objects::ScopedTracker::TrackCallback(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422516 InFlightBackendIO::DoomEntriesBetween"),
- callback)));
+ scoped_refptr<BackendIO> operation(new BackendIO(this, backend_, callback));
operation->DoomEntriesBetween(initial_time, end_time);
PostOperation(operation.get());
}
void InFlightBackendIO::DoomEntriesSince(
const base::Time initial_time, const net::CompletionCallback& callback) {
- scoped_refptr<BackendIO> operation(new BackendIO(
- this, backend_, tracked_objects::ScopedTracker::TrackCallback(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422516 InFlightBackendIO::DoomEntriesSince"),
- callback)));
+ scoped_refptr<BackendIO> operation(new BackendIO(this, backend_, callback));
operation->DoomEntriesSince(initial_time);
PostOperation(operation.get());
}
@@ -422,11 +385,7 @@ void InFlightBackendIO::DoomEntriesSince(
void InFlightBackendIO::OpenNextEntry(Rankings::Iterator* iterator,
Entry** next_entry,
const net::CompletionCallback& callback) {
- scoped_refptr<BackendIO> operation(new BackendIO(
- this, backend_, tracked_objects::ScopedTracker::TrackCallback(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422516 InFlightBackendIO::OpenNextEntry"),
- callback)));
+ scoped_refptr<BackendIO> operation(new BackendIO(this, backend_, callback));
operation->OpenNextEntry(iterator, next_entry);
PostOperation(operation.get());
}
@@ -461,22 +420,14 @@ void InFlightBackendIO::DoomEntryImpl(EntryImpl* entry) {
}
void InFlightBackendIO::FlushQueue(const net::CompletionCallback& callback) {
- scoped_refptr<BackendIO> operation(new BackendIO(
- this, backend_, tracked_objects::ScopedTracker::TrackCallback(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422516 InFlightBackendIO::FlushQueue"),
- callback)));
+ scoped_refptr<BackendIO> operation(new BackendIO(this, backend_, callback));
operation->FlushQueue();
PostOperation(operation.get());
}
void InFlightBackendIO::RunTask(
const base::Closure& task, const net::CompletionCallback& callback) {
- scoped_refptr<BackendIO> operation(new BackendIO(
- this, backend_,
- tracked_objects::ScopedTracker::TrackCallback(
- FROM_HERE_WITH_EXPLICIT_FUNCTION("422516 InFlightBackendIO::RunTask"),
- callback)));
+ scoped_refptr<BackendIO> operation(new BackendIO(this, backend_, callback));
operation->RunTask(task);
PostOperation(operation.get());
}
@@ -484,11 +435,7 @@ void InFlightBackendIO::RunTask(
void InFlightBackendIO::ReadData(EntryImpl* entry, int index, int offset,
net::IOBuffer* buf, int buf_len,
const net::CompletionCallback& callback) {
- scoped_refptr<BackendIO> operation(new BackendIO(
- this, backend_, tracked_objects::ScopedTracker::TrackCallback(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422516 InFlightBackendIO::ReadData"),
- callback)));
+ scoped_refptr<BackendIO> operation(new BackendIO(this, backend_, callback));
operation->ReadData(entry, index, offset, buf, buf_len);
PostOperation(operation.get());
}
@@ -497,11 +444,7 @@ void InFlightBackendIO::WriteData(EntryImpl* entry, int index, int offset,
net::IOBuffer* buf, int buf_len,
bool truncate,
const net::CompletionCallback& callback) {
- scoped_refptr<BackendIO> operation(new BackendIO(
- this, backend_, tracked_objects::ScopedTracker::TrackCallback(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422516 InFlightBackendIO::WriteData"),
- callback)));
+ scoped_refptr<BackendIO> operation(new BackendIO(this, backend_, callback));
operation->WriteData(entry, index, offset, buf, buf_len, truncate);
PostOperation(operation.get());
}
@@ -509,11 +452,7 @@ void InFlightBackendIO::WriteData(EntryImpl* entry, int index, int offset,
void InFlightBackendIO::ReadSparseData(
EntryImpl* entry, int64 offset, net::IOBuffer* buf, int buf_len,
const net::CompletionCallback& callback) {
- scoped_refptr<BackendIO> operation(new BackendIO(
- this, backend_, tracked_objects::ScopedTracker::TrackCallback(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422516 InFlightBackendIO::ReadSparseData"),
- callback)));
+ scoped_refptr<BackendIO> operation(new BackendIO(this, backend_, callback));
operation->ReadSparseData(entry, offset, buf, buf_len);
PostOperation(operation.get());
}
@@ -521,11 +460,7 @@ void InFlightBackendIO::ReadSparseData(
void InFlightBackendIO::WriteSparseData(
EntryImpl* entry, int64 offset, net::IOBuffer* buf, int buf_len,
const net::CompletionCallback& callback) {
- scoped_refptr<BackendIO> operation(new BackendIO(
- this, backend_, tracked_objects::ScopedTracker::TrackCallback(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422516 InFlightBackendIO::WriteSparseData"),
- callback)));
+ scoped_refptr<BackendIO> operation(new BackendIO(this, backend_, callback));
operation->WriteSparseData(entry, offset, buf, buf_len);
PostOperation(operation.get());
}
@@ -533,11 +468,7 @@ void InFlightBackendIO::WriteSparseData(
void InFlightBackendIO::GetAvailableRange(
EntryImpl* entry, int64 offset, int len, int64* start,
const net::CompletionCallback& callback) {
- scoped_refptr<BackendIO> operation(new BackendIO(
- this, backend_, tracked_objects::ScopedTracker::TrackCallback(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422516 InFlightBackendIO::GetAvailableRange"),
- callback)));
+ scoped_refptr<BackendIO> operation(new BackendIO(this, backend_, callback));
operation->GetAvailableRange(entry, offset, len, start);
PostOperation(operation.get());
}
@@ -551,11 +482,7 @@ void InFlightBackendIO::CancelSparseIO(EntryImpl* entry) {
void InFlightBackendIO::ReadyForSparseIO(
EntryImpl* entry, const net::CompletionCallback& callback) {
- scoped_refptr<BackendIO> operation(new BackendIO(
- this, backend_, tracked_objects::ScopedTracker::TrackCallback(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422516 InFlightBackendIO::CancelSparseIO"),
- callback)));
+ scoped_refptr<BackendIO> operation(new BackendIO(this, backend_, callback));
operation->ReadyForSparseIO(entry);
PostOperation(operation.get());
}
@@ -569,14 +496,8 @@ void InFlightBackendIO::OnOperationComplete(BackgroundIO* operation,
BackendIO* op = static_cast<BackendIO*>(operation);
op->OnDone(cancel);
- if (!op->callback().is_null() && (!cancel || op->IsEntryOperation())) {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422516 InFlightBackendIO::OnOperationComplete"));
-
+ if (!op->callback().is_null() && (!cancel || op->IsEntryOperation()))
op->callback().Run(op->result());
- }
}
void InFlightBackendIO::PostOperation(BackendIO* operation) {
diff --git a/net/disk_cache/blockfile/in_flight_io.cc b/net/disk_cache/blockfile/in_flight_io.cc
index cbfcd17..9ada7c5 100644
--- a/net/disk_cache/blockfile/in_flight_io.cc
+++ b/net/disk_cache/blockfile/in_flight_io.cc
@@ -7,7 +7,6 @@
#include "base/bind.h"
#include "base/location.h"
#include "base/logging.h"
-#include "base/profiler/scoped_tracker.h"
#include "base/single_thread_task_runner.h"
#include "base/task_runner.h"
#include "base/thread_task_runner_handle.h"
@@ -88,10 +87,6 @@ void InFlightIO::OnIOComplete(BackgroundIO* operation) {
// Runs on the primary thread.
void InFlightIO::InvokeCallback(BackgroundIO* operation, bool cancel_task) {
{
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION("422516 InFlightIO::InvokeCallback"));
-
// http://crbug.com/74623
base::ThreadRestrictions::ScopedAllowWait allow_wait;
operation->io_completed()->Wait();
diff --git a/net/disk_cache/cache_creator.cc b/net/disk_cache/cache_creator.cc
index 93c06b3..8c4400c 100644
--- a/net/disk_cache/cache_creator.cc
+++ b/net/disk_cache/cache_creator.cc
@@ -4,7 +4,6 @@
#include "base/files/file_path.h"
#include "base/metrics/field_trial.h"
-#include "base/profiler/scoped_tracker.h"
#include "base/single_thread_task_runner.h"
#include "base/strings/stringprintf.h"
#include "net/base/cache_type.h"
@@ -140,10 +139,6 @@ void CacheCreator::DoCallback(int result) {
// If the initialization of the cache fails, and |force| is true, we will
// discard the whole cache and create a new one.
void CacheCreator::OnIOComplete(int result) {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION("422516 CacheCreator::OnIOComplete"));
-
if (result == net::OK || !force_ || retry_)
return DoCallback(result);
diff --git a/net/dns/host_resolver_impl.cc b/net/dns/host_resolver_impl.cc
index 9020476..e84a844 100644
--- a/net/dns/host_resolver_impl.cc
+++ b/net/dns/host_resolver_impl.cc
@@ -24,7 +24,6 @@
#include "base/message_loop/message_loop_proxy.h"
#include "base/metrics/field_trial.h"
#include "base/metrics/histogram.h"
-#include "base/profiler/scoped_tracker.h"
#include "base/stl_util.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
@@ -495,11 +494,6 @@ class HostResolverImpl::Request {
// Prepare final AddressList and call completion callback.
void OnComplete(int error, const AddressList& addr_list) {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/436634 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "436634 HostResolverImpl::Request::OnComplete"));
-
DCHECK(!was_canceled());
if (error == OK)
*addresses_ = EnsurePortOnAddressList(addr_list, info_.port());
@@ -710,11 +704,6 @@ class HostResolverImpl::ProcTask
const uint32 attempt_number,
int error,
const int os_error) {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/436634 is fixed.
- tracked_objects::ScopedTracker tracking_profile1(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "436634 HostResolverImpl::ProcTask::OnLookupComplete1"));
-
DCHECK(origin_loop_->BelongsToCurrentThread());
// If results are empty, we should return an error.
bool empty_list_on_ok = (error == OK && results.empty());
@@ -776,11 +765,6 @@ class HostResolverImpl::ProcTask
net_log_.EndEvent(NetLog::TYPE_HOST_RESOLVER_IMPL_PROC_TASK,
net_log_callback);
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/436634 is fixed.
- tracked_objects::ScopedTracker tracking_profile2(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "436634 HostResolverImpl::ProcTask::OnLookupComplete2"));
-
callback_.Run(error, results_);
}
@@ -1517,11 +1501,6 @@ class HostResolverImpl::Job : public PrioritizedDispatcher::Job,
void OnProcTaskComplete(base::TimeTicks start_time,
int net_error,
const AddressList& addr_list) {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/436634 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "436634 HostResolverImpl::Job::OnProcTaskComplete"));
-
DCHECK(is_proc_running());
if (!resolver_->resolved_known_ipv6_hostname_ &&
@@ -1671,11 +1650,6 @@ class HostResolverImpl::Job : public PrioritizedDispatcher::Job,
// Performs Job's last rites. Completes all Requests. Deletes this.
void CompleteRequests(const HostCache::Entry& entry,
base::TimeDelta ttl) {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/436634 is fixed.
- tracked_objects::ScopedTracker tracking_profile1(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "436634 HostResolverImpl::Job::CompleteRequests1"));
-
CHECK(resolver_.get());
// This job must be removed from resolver's |jobs_| now to make room for a
@@ -1725,11 +1699,6 @@ class HostResolverImpl::Job : public PrioritizedDispatcher::Job,
if (did_complete)
resolver_->CacheResult(key_, entry, ttl);
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/436634 is fixed.
- tracked_objects::ScopedTracker tracking_profile2(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "436634 HostResolverImpl::Job::CompleteRequests2"));
-
// Complete all of the requests that were attached to the job.
for (RequestsList::const_iterator it = requests_.begin();
it != requests_.end(); ++it) {
diff --git a/net/dns/single_request_host_resolver.cc b/net/dns/single_request_host_resolver.cc
index 2c4b3aa..7974aba 100644
--- a/net/dns/single_request_host_resolver.cc
+++ b/net/dns/single_request_host_resolver.cc
@@ -8,7 +8,6 @@
#include "base/bind_helpers.h"
#include "base/compiler_specific.h"
#include "base/logging.h"
-#include "base/profiler/scoped_tracker.h"
#include "net/base/net_errors.h"
namespace net {
@@ -64,11 +63,6 @@ void SingleRequestHostResolver::Cancel() {
}
void SingleRequestHostResolver::OnResolveCompletion(int result) {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/436634 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "436634 SingleRequestHostResolver::OnResolveCompletion"));
-
DCHECK(cur_request_);
DCHECK_EQ(false, cur_request_callback_.is_null());
diff --git a/net/ftp/ftp_network_transaction.cc b/net/ftp/ftp_network_transaction.cc
index 814be92..5732c64 100644
--- a/net/ftp/ftp_network_transaction.cc
+++ b/net/ftp/ftp_network_transaction.cc
@@ -8,7 +8,6 @@
#include "base/bind_helpers.h"
#include "base/compiler_specific.h"
#include "base/metrics/histogram.h"
-#include "base/profiler/scoped_tracker.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_split.h"
#include "base/strings/string_util.h"
@@ -362,11 +361,6 @@ void FtpNetworkTransaction::DoCallback(int rv) {
}
void FtpNetworkTransaction::OnIOComplete(int result) {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/436634 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "436634 FtpNetworkTransaction::OnIOComplete"));
-
int rv = DoLoop(result);
if (rv != ERR_IO_PENDING)
DoCallback(rv);
diff --git a/net/http/disk_based_cert_cache.cc b/net/http/disk_based_cert_cache.cc
index b91fb10..9b39d85 100644
--- a/net/http/disk_based_cert_cache.cc
+++ b/net/http/disk_based_cert_cache.cc
@@ -10,7 +10,6 @@
#include "base/callback_helpers.h"
#include "base/memory/ref_counted.h"
#include "base/metrics/histogram.h"
-#include "base/profiler/scoped_tracker.h"
#include "base/stl_util.h"
#include "base/strings/string_number_conversions.h"
#include "net/base/io_buffer.h"
@@ -398,11 +397,6 @@ void DiskBasedCertCache::ReadWorker::Cancel() {
}
void DiskBasedCertCache::ReadWorker::OnIOComplete(int rv) {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422516 DiskBasedCertCache::ReadWorker::OnIOComplete"));
-
if (canceled_) {
Finish(ERR_FAILED);
return;
diff --git a/net/http/disk_cache_based_quic_server_info.cc b/net/http/disk_cache_based_quic_server_info.cc
index 3951b2e..6ac0bcd 100644
--- a/net/http/disk_cache_based_quic_server_info.cc
+++ b/net/http/disk_cache_based_quic_server_info.cc
@@ -9,7 +9,6 @@
#include "base/callback_helpers.h"
#include "base/logging.h"
#include "base/metrics/histogram.h"
-#include "base/profiler/scoped_tracker.h"
#include "net/base/completion_callback.h"
#include "net/base/io_buffer.h"
#include "net/base/net_errors.h"
@@ -143,11 +142,6 @@ void DiskCacheBasedQuicServerInfo::Persist() {
}
void DiskCacheBasedQuicServerInfo::PersistInternal() {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422516 DiskCacheBasedQuicServerInfo::PersistInternal"));
-
DCHECK(CalledOnValidThread());
DCHECK_NE(GET_BACKEND, state_);
DCHECK(new_data_.empty());
@@ -196,11 +190,6 @@ std::string DiskCacheBasedQuicServerInfo::key() const {
void DiskCacheBasedQuicServerInfo::OnIOComplete(CacheOperationDataShim* unused,
int rv) {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422516 DiskCacheBasedQuicServerInfo::OnIOComplete"));
-
DCHECK_NE(NONE, state_);
rv = DoLoop(rv);
if (rv == ERR_IO_PENDING)
@@ -271,11 +260,6 @@ int DiskCacheBasedQuicServerInfo::DoLoop(int rv) {
}
int DiskCacheBasedQuicServerInfo::DoGetBackendComplete(int rv) {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422516 DiskCacheBasedQuicServerInfo::DoGetBackendComplete"));
-
if (rv == OK) {
backend_ = data_shim_->backend;
state_ = OPEN;
@@ -287,11 +271,6 @@ int DiskCacheBasedQuicServerInfo::DoGetBackendComplete(int rv) {
}
int DiskCacheBasedQuicServerInfo::DoOpenComplete(int rv) {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422516 DiskCacheBasedQuicServerInfo::DoOpenComplete"));
-
if (rv == OK) {
entry_ = data_shim_->entry;
state_ = READ;
@@ -305,11 +284,6 @@ int DiskCacheBasedQuicServerInfo::DoOpenComplete(int rv) {
}
int DiskCacheBasedQuicServerInfo::DoReadComplete(int rv) {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422516 DiskCacheBasedQuicServerInfo::DoReadComplete"));
-
if (rv > 0)
data_.assign(read_buffer_->data(), rv);
else if (rv < 0)
@@ -320,11 +294,6 @@ int DiskCacheBasedQuicServerInfo::DoReadComplete(int rv) {
}
int DiskCacheBasedQuicServerInfo::DoWriteComplete(int rv) {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422516 DiskCacheBasedQuicServerInfo::DoWriteComplete"));
-
if (rv < 0)
RecordQuicServerInfoFailure(WRITE_FAILURE);
state_ = SET_DONE;
@@ -332,11 +301,6 @@ int DiskCacheBasedQuicServerInfo::DoWriteComplete(int rv) {
}
int DiskCacheBasedQuicServerInfo::DoCreateOrOpenComplete(int rv) {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422516 DiskCacheBasedQuicServerInfo::DoCreateOrOpenComplete"));
-
if (rv != OK) {
RecordQuicServerInfoFailure(CREATE_OR_OPEN_FAILURE);
state_ = SET_DONE;
@@ -352,31 +316,16 @@ int DiskCacheBasedQuicServerInfo::DoCreateOrOpenComplete(int rv) {
}
int DiskCacheBasedQuicServerInfo::DoGetBackend() {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422516 DiskCacheBasedQuicServerInfo::DoGetBackend"));
-
state_ = GET_BACKEND_COMPLETE;
return http_cache_->GetBackend(&data_shim_->backend, io_callback_);
}
int DiskCacheBasedQuicServerInfo::DoOpen() {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422516 DiskCacheBasedQuicServerInfo::DoOpen"));
-
state_ = OPEN_COMPLETE;
return backend_->OpenEntry(key(), &data_shim_->entry, io_callback_);
}
int DiskCacheBasedQuicServerInfo::DoRead() {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422516 DiskCacheBasedQuicServerInfo::DoRead"));
-
const int32 size = entry_->GetDataSize(0 /* index */);
if (!size) {
state_ = WAIT_FOR_DATA_READY_DONE;
@@ -390,11 +339,6 @@ int DiskCacheBasedQuicServerInfo::DoRead() {
}
int DiskCacheBasedQuicServerInfo::DoWrite() {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422516 DiskCacheBasedQuicServerInfo::DoWrite"));
-
write_buffer_ = new IOBuffer(new_data_.size());
memcpy(write_buffer_->data(), new_data_.data(), new_data_.size());
state_ = WRITE_COMPLETE;
@@ -408,11 +352,6 @@ int DiskCacheBasedQuicServerInfo::DoWrite() {
}
int DiskCacheBasedQuicServerInfo::DoCreateOrOpen() {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422516 DiskCacheBasedQuicServerInfo::DoCreateOrOpen"));
-
state_ = CREATE_OR_OPEN_COMPLETE;
if (entry_)
return OK;
@@ -425,11 +364,6 @@ int DiskCacheBasedQuicServerInfo::DoCreateOrOpen() {
}
int DiskCacheBasedQuicServerInfo::DoWaitForDataReadyDone() {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422516 DiskCacheBasedQuicServerInfo::DoWaitForDataReadyDone"));
-
DCHECK(!ready_);
state_ = NONE;
ready_ = true;
diff --git a/net/http/http_auth_handler_negotiate.cc b/net/http/http_auth_handler_negotiate.cc
index 557051c..422ddd7 100644
--- a/net/http/http_auth_handler_negotiate.cc
+++ b/net/http/http_auth_handler_negotiate.cc
@@ -7,7 +7,6 @@
#include "base/bind.h"
#include "base/bind_helpers.h"
#include "base/logging.h"
-#include "base/profiler/scoped_tracker.h"
#include "base/strings/stringprintf.h"
#include "net/base/address_family.h"
#include "net/base/net_errors.h"
@@ -233,11 +232,6 @@ int HttpAuthHandlerNegotiate::GenerateAuthTokenImpl(
}
void HttpAuthHandlerNegotiate::OnIOComplete(int result) {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/436634 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "436634 HttpAuthHandlerNegotiate::OnIOComplete"));
-
int rv = DoLoop(result);
if (rv != ERR_IO_PENDING)
DoCallback(rv);
diff --git a/net/http/http_cache.cc b/net/http/http_cache.cc
index cef2928..51929ff 100644
--- a/net/http/http_cache.cc
+++ b/net/http/http_cache.cc
@@ -23,7 +23,6 @@
#include "base/metrics/field_trial.h"
#include "base/metrics/histogram.h"
#include "base/pickle.h"
-#include "base/profiler/scoped_tracker.h"
#include "base/stl_util.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_util.h"
@@ -1333,11 +1332,6 @@ void HttpCache::OnIOComplete(int result, PendingOp* pending_op) {
void HttpCache::OnPendingOpComplete(const base::WeakPtr<HttpCache>& cache,
PendingOp* pending_op,
int rv) {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422516 HttpCache::OnPendingOpComplete"));
-
if (cache.get()) {
cache->OnIOComplete(rv, pending_op);
} else {
diff --git a/net/http/http_cache_transaction.cc b/net/http/http_cache_transaction.cc
index 009ed4a..5d6dc4d 100644
--- a/net/http/http_cache_transaction.cc
+++ b/net/http/http_cache_transaction.cc
@@ -441,12 +441,8 @@ int HttpCache::Transaction::Start(const HttpRequestInfo* request,
// Setting this here allows us to check for the existence of a callback_ to
// determine if we are still inside Start.
- if (rv == ERR_IO_PENDING) {
- callback_ = tracked_objects::ScopedTracker::TrackCallback(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422516 HttpCache::Transaction::Start"),
- callback);
- }
+ if (rv == ERR_IO_PENDING)
+ callback_ = callback;
return rv;
}
@@ -463,12 +459,8 @@ int HttpCache::Transaction::RestartIgnoringLastError(
int rv = RestartNetworkRequest();
- if (rv == ERR_IO_PENDING) {
- callback_ = tracked_objects::ScopedTracker::TrackCallback(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422516 HttpCache::Transaction::RestartIgnoringLastError"),
- callback);
- }
+ if (rv == ERR_IO_PENDING)
+ callback_ = callback;
return rv;
}
@@ -486,12 +478,8 @@ int HttpCache::Transaction::RestartWithCertificate(
int rv = RestartNetworkRequestWithCertificate(client_cert);
- if (rv == ERR_IO_PENDING) {
- callback_ = tracked_objects::ScopedTracker::TrackCallback(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422516 HttpCache::Transaction::RestartWithCertificate"),
- callback);
- }
+ if (rv == ERR_IO_PENDING)
+ callback_ = callback;
return rv;
}
@@ -513,12 +501,8 @@ int HttpCache::Transaction::RestartWithAuth(
int rv = RestartNetworkRequestWithAuth(credentials);
- if (rv == ERR_IO_PENDING) {
- callback_ = tracked_objects::ScopedTracker::TrackCallback(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422516 HttpCache::Transaction::RestartWithAuth"),
- callback);
- }
+ if (rv == ERR_IO_PENDING)
+ callback_ = callback;
return rv;
}
@@ -576,9 +560,7 @@ int HttpCache::Transaction::Read(IOBuffer* buf, int buf_len,
if (rv == ERR_IO_PENDING) {
DCHECK(callback_.is_null());
- callback_ = tracked_objects::ScopedTracker::TrackCallback(
- FROM_HERE_WITH_EXPLICIT_FUNCTION("422516 HttpCache::Transaction::Read"),
- callback);
+ callback_ = callback;
}
return rv;
}
@@ -717,11 +699,6 @@ int HttpCache::Transaction::ResumeNetworkStart() {
//-----------------------------------------------------------------------------
void HttpCache::Transaction::DoCallback(int rv) {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422516 HttpCache::Transaction::DoCallback"));
-
DCHECK(rv != ERR_IO_PENDING);
DCHECK(!callback_.is_null());
@@ -1037,11 +1014,6 @@ int HttpCache::Transaction::DoLoop(int result) {
}
int HttpCache::Transaction::DoGetBackend() {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422516 HttpCache::Transaction::DoGetBackend"));
-
cache_pending_ = true;
next_state_ = STATE_GET_BACKEND_COMPLETE;
net_log_.BeginEvent(NetLog::TYPE_HTTP_CACHE_GET_BACKEND);
@@ -1049,11 +1021,6 @@ int HttpCache::Transaction::DoGetBackend() {
}
int HttpCache::Transaction::DoGetBackendComplete(int result) {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422516 HttpCache::Transaction::DoGetBackendComplete"));
-
DCHECK(result == OK || result == ERR_FAILED);
net_log_.EndEventWithNetErrorCode(NetLog::TYPE_HTTP_CACHE_GET_BACKEND,
result);
@@ -1119,11 +1086,6 @@ int HttpCache::Transaction::DoGetBackendComplete(int result) {
}
int HttpCache::Transaction::DoSendRequest() {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422516 HttpCache::Transaction::DoSendRequest"));
-
DCHECK(mode_ & WRITE || mode_ == NONE);
DCHECK(!network_trans_.get());
@@ -1151,11 +1113,6 @@ int HttpCache::Transaction::DoSendRequest() {
}
int HttpCache::Transaction::DoSendRequestComplete(int result) {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422516 HttpCache::Transaction::DoSendRequestComplete"));
-
if (!cache_.get())
return ERR_UNEXPECTED;
@@ -1211,11 +1168,6 @@ int HttpCache::Transaction::DoSendRequestComplete(int result) {
// We received the response headers and there is no error.
int HttpCache::Transaction::DoSuccessfulSendRequest() {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422516 HttpCache::Transaction::DoSuccessfulSendRequest"));
-
DCHECK(!new_response_);
const HttpResponseInfo* new_response = network_trans_->GetResponseInfo();
bool authentication_failure = false;
@@ -1318,21 +1270,11 @@ int HttpCache::Transaction::DoSuccessfulSendRequest() {
}
int HttpCache::Transaction::DoNetworkRead() {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422516 HttpCache::Transaction::DoNetworkRead"));
-
next_state_ = STATE_NETWORK_READ_COMPLETE;
return network_trans_->Read(read_buf_.get(), io_buf_len_, io_callback_);
}
int HttpCache::Transaction::DoNetworkReadComplete(int result) {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422516 HttpCache::Transaction::DoNetworkReadComplete"));
-
DCHECK(mode_ & WRITE || mode_ == NONE);
if (!cache_.get())
@@ -1348,11 +1290,6 @@ int HttpCache::Transaction::DoNetworkReadComplete(int result) {
}
int HttpCache::Transaction::DoInitEntry() {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422516 HttpCache::Transaction::DoInitEntry"));
-
DCHECK(!new_entry_);
if (!cache_.get())
@@ -1368,11 +1305,6 @@ int HttpCache::Transaction::DoInitEntry() {
}
int HttpCache::Transaction::DoOpenEntry() {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422516 HttpCache::Transaction::DoOpenEntry"));
-
DCHECK(!new_entry_);
next_state_ = STATE_OPEN_ENTRY_COMPLETE;
cache_pending_ = true;
@@ -1382,11 +1314,6 @@ int HttpCache::Transaction::DoOpenEntry() {
}
int HttpCache::Transaction::DoOpenEntryComplete(int result) {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422516 HttpCache::Transaction::DoOpenEntryComplete"));
-
// It is important that we go to STATE_ADD_TO_ENTRY whenever the result is
// OK, otherwise the cache will end up with an active entry without any
// transaction attached.
@@ -1428,11 +1355,6 @@ int HttpCache::Transaction::DoOpenEntryComplete(int result) {
}
int HttpCache::Transaction::DoCreateEntry() {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422516 HttpCache::Transaction::DoCreateEntry"));
-
DCHECK(!new_entry_);
next_state_ = STATE_CREATE_ENTRY_COMPLETE;
cache_pending_ = true;
@@ -1441,11 +1363,6 @@ int HttpCache::Transaction::DoCreateEntry() {
}
int HttpCache::Transaction::DoCreateEntryComplete(int result) {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422516 HttpCache::Transaction::DoCreateEntryComplete"));
-
// It is important that we go to STATE_ADD_TO_ENTRY whenever the result is
// OK, otherwise the cache will end up with an active entry without any
// transaction attached.
@@ -1474,11 +1391,6 @@ int HttpCache::Transaction::DoCreateEntryComplete(int result) {
}
int HttpCache::Transaction::DoDoomEntry() {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422516 HttpCache::Transaction::DoDoomEntry"));
-
next_state_ = STATE_DOOM_ENTRY_COMPLETE;
cache_pending_ = true;
if (first_cache_access_since_.is_null())
@@ -1488,11 +1400,6 @@ int HttpCache::Transaction::DoDoomEntry() {
}
int HttpCache::Transaction::DoDoomEntryComplete(int result) {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422516 HttpCache::Transaction::DoDoomEntryComplete"));
-
net_log_.EndEventWithNetErrorCode(NetLog::TYPE_HTTP_CACHE_DOOM_ENTRY, result);
next_state_ = STATE_CREATE_ENTRY;
cache_pending_ = false;
@@ -1502,11 +1409,6 @@ int HttpCache::Transaction::DoDoomEntryComplete(int result) {
}
int HttpCache::Transaction::DoAddToEntry() {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422516 HttpCache::Transaction::DoAddToEntry"));
-
DCHECK(new_entry_);
cache_pending_ = true;
next_state_ = STATE_ADD_TO_ENTRY_COMPLETE;
@@ -1548,11 +1450,6 @@ int HttpCache::Transaction::DoAddToEntry() {
}
int HttpCache::Transaction::DoAddToEntryComplete(int result) {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422516 HttpCache::Transaction::DoAddToEntryComplete"));
-
net_log_.EndEventWithNetErrorCode(NetLog::TYPE_HTTP_CACHE_ADD_TO_ENTRY,
result);
const TimeDelta entry_lock_wait =
@@ -1604,11 +1501,6 @@ int HttpCache::Transaction::DoAddToEntryComplete(int result) {
// We may end up here multiple times for a given request.
int HttpCache::Transaction::DoStartPartialCacheValidation() {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422516 HttpCache::Transaction::DoStartPartialCacheValidation"));
-
if (mode_ == NONE)
return OK;
@@ -1617,11 +1509,6 @@ int HttpCache::Transaction::DoStartPartialCacheValidation() {
}
int HttpCache::Transaction::DoCompletePartialCacheValidation(int result) {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422516 HttpCache::Transaction::DoCompletePartialCacheValidation"));
-
if (!result) {
// This is the end of the request.
if (mode_ & WRITE) {
@@ -1649,11 +1536,6 @@ int HttpCache::Transaction::DoCompletePartialCacheValidation(int result) {
// We received 304 or 206 and we want to update the cached response headers.
int HttpCache::Transaction::DoUpdateCachedResponse() {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422516 HttpCache::Transaction::DoUpdateCachedResponse"));
-
next_state_ = STATE_UPDATE_CACHED_RESPONSE_COMPLETE;
int rv = OK;
// Update cached response based on headers in new_response.
@@ -1691,11 +1573,6 @@ int HttpCache::Transaction::DoUpdateCachedResponse() {
}
int HttpCache::Transaction::DoUpdateCachedResponseComplete(int result) {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422516 HttpCache::Transaction::DoUpdateCachedResponseComplete"));
-
if (mode_ == UPDATE) {
DCHECK(!handling_206_);
// We got a "not modified" response and already updated the corresponding
@@ -1729,11 +1606,6 @@ int HttpCache::Transaction::DoUpdateCachedResponseComplete(int result) {
}
int HttpCache::Transaction::DoOverwriteCachedResponse() {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422516 HttpCache::Transaction::DoOverwriteCachedResponse"));
-
if (mode_ & READ) {
next_state_ = STATE_PARTIAL_HEADERS_RECEIVED;
return OK;
@@ -1770,11 +1642,6 @@ int HttpCache::Transaction::DoOverwriteCachedResponse() {
}
int HttpCache::Transaction::DoTruncateCachedData() {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422516 HttpCache::Transaction::DoTruncateCachedData"));
-
next_state_ = STATE_TRUNCATE_CACHED_DATA_COMPLETE;
if (!entry_)
return OK;
@@ -1785,11 +1652,6 @@ int HttpCache::Transaction::DoTruncateCachedData() {
}
int HttpCache::Transaction::DoTruncateCachedDataComplete(int result) {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422516 HttpCache::Transaction::DoTruncateCachedDataComplete"));
-
if (entry_) {
if (net_log_.IsLogging()) {
net_log_.EndEventWithNetErrorCode(NetLog::TYPE_HTTP_CACHE_WRITE_DATA,
@@ -1802,11 +1664,6 @@ int HttpCache::Transaction::DoTruncateCachedDataComplete(int result) {
}
int HttpCache::Transaction::DoTruncateCachedMetadata() {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422516 HttpCache::Transaction::DoTruncateCachedMetadata"));
-
next_state_ = STATE_TRUNCATE_CACHED_METADATA_COMPLETE;
if (!entry_)
return OK;
@@ -1817,11 +1674,6 @@ int HttpCache::Transaction::DoTruncateCachedMetadata() {
}
int HttpCache::Transaction::DoTruncateCachedMetadataComplete(int result) {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422516 HttpCache::Transaction::DoTruncateCachedMetadataComplete"));
-
if (entry_) {
if (net_log_.IsLogging()) {
net_log_.EndEventWithNetErrorCode(NetLog::TYPE_HTTP_CACHE_WRITE_INFO,
@@ -1834,11 +1686,6 @@ int HttpCache::Transaction::DoTruncateCachedMetadataComplete(int result) {
}
int HttpCache::Transaction::DoPartialHeadersReceived() {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422516 HttpCache::Transaction::DoPartialHeadersReceived"));
-
new_response_ = NULL;
if (entry_ && !partial_.get() &&
entry_->disk_entry->GetDataSize(kMetadataIndex))
@@ -1862,11 +1709,6 @@ int HttpCache::Transaction::DoPartialHeadersReceived() {
}
int HttpCache::Transaction::DoCacheReadResponse() {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422516 HttpCache::Transaction::DoCacheReadResponse"));
-
DCHECK(entry_);
next_state_ = STATE_CACHE_READ_RESPONSE_COMPLETE;
@@ -1879,11 +1721,6 @@ int HttpCache::Transaction::DoCacheReadResponse() {
}
int HttpCache::Transaction::DoCacheReadResponseComplete(int result) {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422516 HttpCache::Transaction::DoCacheReadResponseComplete"));
-
net_log_.EndEventWithNetErrorCode(NetLog::TYPE_HTTP_CACHE_READ_INFO, result);
if (result != io_buf_len_ ||
!HttpCache::ParseResponseInfo(read_buf_->data(), io_buf_len_,
@@ -1969,7 +1806,7 @@ int HttpCache::Transaction::DoCacheToggleUnusedSincePrefetchComplete(
}
int HttpCache::Transaction::DoCacheWriteResponse() {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed.
+ // TODO(rtenneti): Remove ScopedTracker below once crbug.com/422516 is fixed.
tracked_objects::ScopedTracker tracking_profile(
FROM_HERE_WITH_EXPLICIT_FUNCTION(
"422516 HttpCache::Transaction::DoCacheWriteResponse"));
@@ -1982,11 +1819,6 @@ int HttpCache::Transaction::DoCacheWriteResponse() {
}
int HttpCache::Transaction::DoCacheWriteTruncatedResponse() {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422516 HttpCache::Transaction::DoCacheWriteTruncatedResponse"));
-
if (entry_) {
if (net_log_.IsLogging())
net_log_.BeginEvent(NetLog::TYPE_HTTP_CACHE_WRITE_INFO);
@@ -1995,11 +1827,6 @@ int HttpCache::Transaction::DoCacheWriteTruncatedResponse() {
}
int HttpCache::Transaction::DoCacheWriteResponseComplete(int result) {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422516 HttpCache::Transaction::DoCacheWriteResponseComplete"));
-
next_state_ = target_state_;
target_state_ = STATE_NONE;
if (!entry_)
@@ -2018,11 +1845,6 @@ int HttpCache::Transaction::DoCacheWriteResponseComplete(int result) {
}
int HttpCache::Transaction::DoCacheReadMetadata() {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422516 HttpCache::Transaction::DoCacheReadMetadata"));
-
DCHECK(entry_);
DCHECK(!response_.metadata.get());
next_state_ = STATE_CACHE_READ_METADATA_COMPLETE;
@@ -2038,11 +1860,6 @@ int HttpCache::Transaction::DoCacheReadMetadata() {
}
int HttpCache::Transaction::DoCacheReadMetadataComplete(int result) {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422516 HttpCache::Transaction::DoCacheReadMetadataComplete"));
-
net_log_.EndEventWithNetErrorCode(NetLog::TYPE_HTTP_CACHE_READ_INFO, result);
if (result != response_.metadata->size())
return OnCacheReadError(result, false);
@@ -2050,21 +1867,11 @@ int HttpCache::Transaction::DoCacheReadMetadataComplete(int result) {
}
int HttpCache::Transaction::DoCacheQueryData() {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422516 HttpCache::Transaction::DoCacheQueryData"));
-
next_state_ = STATE_CACHE_QUERY_DATA_COMPLETE;
return entry_->disk_entry->ReadyForSparseIO(io_callback_);
}
int HttpCache::Transaction::DoCacheQueryDataComplete(int result) {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422516 HttpCache::Transaction::DoCacheQueryDataComplete"));
-
DCHECK_EQ(OK, result);
if (!cache_.get())
return ERR_UNEXPECTED;
@@ -2073,11 +1880,6 @@ int HttpCache::Transaction::DoCacheQueryDataComplete(int result) {
}
int HttpCache::Transaction::DoCacheReadData() {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422516 HttpCache::Transaction::DoCacheReadData"));
-
DCHECK(entry_);
next_state_ = STATE_CACHE_READ_DATA_COMPLETE;
@@ -2094,11 +1896,6 @@ int HttpCache::Transaction::DoCacheReadData() {
}
int HttpCache::Transaction::DoCacheReadDataComplete(int result) {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422516 HttpCache::Transaction::DoCacheReadDataComplete"));
-
if (net_log_.IsLogging()) {
net_log_.EndEventWithNetErrorCode(NetLog::TYPE_HTTP_CACHE_READ_DATA,
result);
@@ -2127,11 +1924,6 @@ int HttpCache::Transaction::DoCacheReadDataComplete(int result) {
}
int HttpCache::Transaction::DoCacheWriteData(int num_bytes) {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422516 HttpCache::Transaction::DoCacheWriteData"));
-
next_state_ = STATE_CACHE_WRITE_DATA_COMPLETE;
write_len_ = num_bytes;
if (entry_) {
@@ -2143,11 +1935,6 @@ int HttpCache::Transaction::DoCacheWriteData(int num_bytes) {
}
int HttpCache::Transaction::DoCacheWriteDataComplete(int result) {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422516 HttpCache::Transaction::DoCacheWriteDataComplete"));
-
if (entry_) {
if (net_log_.IsLogging()) {
net_log_.EndEventWithNetErrorCode(NetLog::TYPE_HTTP_CACHE_WRITE_DATA,
@@ -3248,10 +3035,6 @@ void HttpCache::Transaction::RecordHistograms() {
}
void HttpCache::Transaction::OnIOComplete(int result) {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION("422516 Transaction::OnIOComplete"));
-
DoLoop(result);
}
diff --git a/net/http/partial_data.cc b/net/http/partial_data.cc
index f0615d5..2dcb015 100644
--- a/net/http/partial_data.cc
+++ b/net/http/partial_data.cc
@@ -8,7 +8,6 @@
#include "base/bind_helpers.h"
#include "base/format_macros.h"
#include "base/logging.h"
-#include "base/profiler/scoped_tracker.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_util.h"
#include "base/strings/stringprintf.h"
@@ -90,11 +89,6 @@ int PartialData::Core::GetAvailableRange(disk_cache::Entry* entry, int64 offset,
}
void PartialData::Core::OnIOComplete(int result) {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422516 PartialData::Core::OnIOComplete"));
-
if (owner_)
owner_->GetAvailableRangeCompleted(result, start_);
delete this;
diff --git a/net/proxy/proxy_resolver_v8_tracing.cc b/net/proxy/proxy_resolver_v8_tracing.cc
index a9b4f97..3ad166c 100644
--- a/net/proxy/proxy_resolver_v8_tracing.cc
+++ b/net/proxy/proxy_resolver_v8_tracing.cc
@@ -722,11 +722,6 @@ void ProxyResolverV8Tracing::Job::DoDnsOperation() {
}
void ProxyResolverV8Tracing::Job::OnDnsOperationComplete(int result) {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/436634 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "436634 ProxyResolverV8Tracing::Job::OnDnsOperationComplete"));
-
CheckIsOnOriginThread();
DCHECK(!cancelled_.IsSet());
diff --git a/net/proxy/proxy_script_decider.cc b/net/proxy/proxy_script_decider.cc
index 3d830fc..53f2b43 100644
--- a/net/proxy/proxy_script_decider.cc
+++ b/net/proxy/proxy_script_decider.cc
@@ -167,11 +167,6 @@ ProxyScriptDecider::PacSourceList ProxyScriptDecider::
}
void ProxyScriptDecider::OnIOCompletion(int result) {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/436634 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "436634 ProxyScriptDecider::OnIOCompletion"));
-
DCHECK_NE(STATE_NONE, next_state_);
int rv = DoLoop(result);
if (rv != ERR_IO_PENDING) {
diff --git a/net/quic/crypto/quic_crypto_client_config.cc b/net/quic/crypto/quic_crypto_client_config.cc
index 32b0a68..98531df 100644
--- a/net/quic/crypto/quic_crypto_client_config.cc
+++ b/net/quic/crypto/quic_crypto_client_config.cc
@@ -6,7 +6,6 @@
#include "base/metrics/histogram.h"
#include "base/metrics/sparse_histogram.h"
-#include "base/profiler/scoped_tracker.h"
#include "base/stl_util.h"
#include "base/strings/string_util.h"
#include "net/quic/crypto/cert_compressor.h"
@@ -401,11 +400,6 @@ QuicErrorCode QuicCryptoClientConfig::FillClientHello(
QuicCryptoNegotiatedParameters* out_params,
CryptoHandshakeMessage* out,
string* error_details) const {
- // TODO(rtenneti): Remove ScopedTracker below once crbug.com/422516 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422516 QuicCryptoClientConfig::FillClientHello"));
-
DCHECK(error_details != nullptr);
FillInchoateClientHello(server_id, preferred_version, cached,
diff --git a/net/quic/quic_crypto_client_stream.cc b/net/quic/quic_crypto_client_stream.cc
index aa1b6ee..28a6db8 100644
--- a/net/quic/quic_crypto_client_stream.cc
+++ b/net/quic/quic_crypto_client_stream.cc
@@ -246,11 +246,6 @@ void QuicCryptoClientStream::DoInitialize(
void QuicCryptoClientStream::DoSendCHLO(
const CryptoHandshakeMessage* in,
QuicCryptoClientConfig::CachedState* cached) {
- // TODO(rtenneti): Remove ScopedTracker below once crbug.com/422516 is fixed.
- tracked_objects::ScopedTracker tracking_profile1(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422516 QuicCryptoClientStream::DoSendCHLO1"));
-
// Send the client hello in plaintext.
session()->connection()->SetDefaultEncryptionLevel(ENCRYPTION_NONE);
if (num_client_hellos_ > kMaxClientHellos) {
@@ -301,11 +296,6 @@ void QuicCryptoClientStream::DoSendCHLO(
&out,
&error_details);
- // TODO(rtenneti): Remove ScopedTracker below once crbug.com/422516 is fixed.
- tracked_objects::ScopedTracker tracking_profile2(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422516 QuicCryptoClientStream::DoSendCHLO2"));
-
if (error != QUIC_NO_ERROR) {
// Flush the cached config so that, if it's bad, the server has a
// chance to send us another in the future.
@@ -500,11 +490,6 @@ void QuicCryptoClientStream::DoGetChannelIDComplete() {
void QuicCryptoClientStream::DoReceiveSHLO(
const CryptoHandshakeMessage* in,
QuicCryptoClientConfig::CachedState* cached) {
- // TODO(rtenneti): Remove ScopedTracker below once crbug.com/422516 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422516 QuicCryptoClientStream::DoReceiveSHLO"));
-
next_state_ = STATE_NONE;
// We sent a CHLO that we expected to be accepted and now we're hoping
// for a SHLO from the server to confirm that.
diff --git a/net/socket/client_socket_pool_base.cc b/net/socket/client_socket_pool_base.cc
index a1d683a..0bc0056 100644
--- a/net/socket/client_socket_pool_base.cc
+++ b/net/socket/client_socket_pool_base.cc
@@ -8,7 +8,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"
@@ -864,11 +863,6 @@ bool ClientSocketPoolBaseHelper::FindTopStalledGroup(
void ClientSocketPoolBaseHelper::OnConnectJobComplete(
int result, ConnectJob* job) {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/436634 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "436634 ClientSocketPoolBaseHelper::OnConnectJobComplete"));
-
DCHECK_NE(ERR_IO_PENDING, result);
const std::string group_name = job->group_name();
GroupMap::iterator group_it = group_map_.find(group_name);
diff --git a/net/socket/socks_client_socket.cc b/net/socket/socks_client_socket.cc
index 18fcf74..fd16f83 100644
--- a/net/socket/socks_client_socket.cc
+++ b/net/socket/socks_client_socket.cc
@@ -8,7 +8,6 @@
#include "base/bind.h"
#include "base/callback_helpers.h"
#include "base/compiler_specific.h"
-#include "base/profiler/scoped_tracker.h"
#include "base/sys_byteorder.h"
#include "net/base/io_buffer.h"
#include "net/base/net_util.h"
@@ -231,11 +230,6 @@ void SOCKSClientSocket::DoCallback(int result) {
}
void SOCKSClientSocket::OnIOComplete(int result) {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/436634 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "436634 SOCKSClientSocket::OnIOComplete"));
-
DCHECK_NE(STATE_NONE, next_state_);
int rv = DoLoop(result);
if (rv != ERR_IO_PENDING) {
diff --git a/net/socket/ssl_client_socket_nss.cc b/net/socket/ssl_client_socket_nss.cc
index 86a592ba1..b7beae1 100644
--- a/net/socket/ssl_client_socket_nss.cc
+++ b/net/socket/ssl_client_socket_nss.cc
@@ -71,7 +71,6 @@
#include "base/logging.h"
#include "base/memory/singleton.h"
#include "base/metrics/histogram.h"
-#include "base/profiler/scoped_tracker.h"
#include "base/single_thread_task_runner.h"
#include "base/stl_util.h"
#include "base/strings/string_number_conversions.h"
@@ -1656,11 +1655,6 @@ void SSLClientSocketNSS::Core::HandshakeCallback(
}
void SSLClientSocketNSS::Core::HandshakeSucceeded() {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/424386 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "424386 SSLClientSocketNSS::Core::HandshakeSucceeded"));
-
DCHECK(OnNSSTaskRunner());
PRBool last_handshake_resumed;
@@ -1687,11 +1681,6 @@ void SSLClientSocketNSS::Core::HandshakeSucceeded() {
}
int SSLClientSocketNSS::Core::HandleNSSError(PRErrorCode nss_error) {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/424386 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "424386 SSLClientSocketNSS::Core::HandleNSSError"));
-
DCHECK(OnNSSTaskRunner());
int net_error = MapNSSClientError(nss_error);
@@ -1724,11 +1713,6 @@ int SSLClientSocketNSS::Core::HandleNSSError(PRErrorCode nss_error) {
}
int SSLClientSocketNSS::Core::DoHandshakeLoop(int last_io_result) {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/424386 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "424386 SSLClientSocketNSS::Core::DoHandshakeLoop"));
-
DCHECK(OnNSSTaskRunner());
int rv = last_io_result;
@@ -1765,11 +1749,6 @@ int SSLClientSocketNSS::Core::DoHandshakeLoop(int last_io_result) {
}
int SSLClientSocketNSS::Core::DoReadLoop(int result) {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/424386 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "424386 SSLClientSocketNSS::Core::DoReadLoop"));
-
DCHECK(OnNSSTaskRunner());
DCHECK(false_started_ || handshake_callback_called_);
DCHECK_EQ(STATE_NONE, next_handshake_state_);
@@ -1829,21 +1808,11 @@ int SSLClientSocketNSS::Core::DoWriteLoop(int result) {
}
int SSLClientSocketNSS::Core::DoHandshake() {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/424386 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "424386 SSLClientSocketNSS::Core::DoHandshake"));
-
DCHECK(OnNSSTaskRunner());
int net_error = OK;
SECStatus rv = SSL_ForceHandshake(nss_fd_);
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/424386 is fixed.
- tracked_objects::ScopedTracker tracking_profile1(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "424386 SSLClientSocketNSS::Core::DoHandshake 1"));
-
// Note: this function may be called multiple times during the handshake, so
// even though channel id and client auth are separate else cases, they can
// both be used during a single SSL handshake.
@@ -1882,11 +1851,6 @@ int SSLClientSocketNSS::Core::DoHandshake() {
}
int SSLClientSocketNSS::Core::DoGetDBCertComplete(int result) {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/424386 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "424386 SSLClientSocketNSS::Core::DoGetDBCertComplete"));
-
SECStatus rv;
PostOrRunCallback(
FROM_HERE,
@@ -2071,11 +2035,6 @@ int SSLClientSocketNSS::Core::DoPayloadWrite() {
// transport socket. Return true if some I/O performed, false
// otherwise (error or ERR_IO_PENDING).
bool SSLClientSocketNSS::Core::DoTransportIO() {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/424386 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "424386 SSLClientSocketNSS::Core::DoTransportIO"));
-
DCHECK(OnNSSTaskRunner());
bool network_moved = false;
@@ -2252,11 +2211,6 @@ void SSLClientSocketNSS::Core::OnSendComplete(int result) {
// callback. For Read() and Write(), that's what we want. But for Connect(),
// the caller expects OK (i.e. 0) for success.
void SSLClientSocketNSS::Core::DoConnectCallback(int rv) {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/424386 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "424386 SSLClientSocketNSS::Core::DoConnectCallback"));
-
DCHECK(OnNSSTaskRunner());
DCHECK_NE(rv, ERR_IO_PENDING);
DCHECK(!user_connect_callback_.is_null());
@@ -2268,11 +2222,6 @@ void SSLClientSocketNSS::Core::DoConnectCallback(int rv) {
}
void SSLClientSocketNSS::Core::DoReadCallback(int rv) {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/424386 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "424386 SSLClientSocketNSS::Core::DoReadCallback"));
-
DCHECK(OnNSSTaskRunner());
DCHECK_NE(ERR_IO_PENDING, rv);
DCHECK(!user_read_callback_.is_null());
diff --git a/net/socket/ssl_client_socket_openssl.cc b/net/socket/ssl_client_socket_openssl.cc
index 0993e47..a3263f8 100644
--- a/net/socket/ssl_client_socket_openssl.cc
+++ b/net/socket/ssl_client_socket_openssl.cc
@@ -888,7 +888,7 @@ bool SSLClientSocketOpenSSL::DoTransportIO() {
return network_moved;
}
-// TODO(vadimt): Remove including "base/threading/thread_local.h" and
+// TODO(cbentzel): Remove including "base/threading/thread_local.h" and
// g_first_run_completed once crbug.com/424386 is fixed.
base::LazyInstance<base::ThreadLocalBoolean>::Leaky g_first_run_completed =
LAZY_INSTANCE_INITIALIZER;
@@ -899,42 +899,25 @@ int SSLClientSocketOpenSSL::DoHandshake() {
int rv;
- // TODO(vadimt): Leave only 1 call to SSL_do_handshake once crbug.com/424386
+ // TODO(cbentzel): Leave only 1 call to SSL_do_handshake once crbug.com/424386
// is fixed.
if (ssl_config_.send_client_cert && ssl_config_.client_cert.get()) {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/424386 is fixed.
- tracked_objects::ScopedTracker tracking_profile1(
- FROM_HERE_WITH_EXPLICIT_FUNCTION("424386 DoHandshake_WithCert"));
-
rv = SSL_do_handshake(ssl_);
} else {
if (g_first_run_completed.Get().Get()) {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/424386 is
+ // TODO(cbentzel): Remove ScopedTracker below once crbug.com/424386 is
// fixed.
- tracked_objects::ScopedTracker tracking_profile1(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "424386 DoHandshake_WithoutCert Not First"));
+ tracked_objects::ScopedTracker tracking_profile(
+ FROM_HERE_WITH_EXPLICIT_FUNCTION("424386 SSL_do_handshake()"));
rv = SSL_do_handshake(ssl_);
} else {
g_first_run_completed.Get().Set(true);
-
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/424386 is
- // fixed.
- tracked_objects::ScopedTracker tracking_profile1(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "424386 DoHandshake_WithoutCert First"));
-
rv = SSL_do_handshake(ssl_);
}
}
if (rv == 1) {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/424386 is fixed.
- tracked_objects::ScopedTracker tracking_profile3(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "424386 SSLClientSocketOpenSSL::DoHandshake3"));
-
if (trying_cached_session_ && logging::DEBUG_MODE) {
DVLOG(2) << "Result of session reuse for " << host_and_port_.ToString()
<< " is: " << (SSL_session_reused(ssl_) ? "Success" : "Fail");
@@ -982,11 +965,6 @@ int SSLClientSocketOpenSSL::DoHandshake() {
UpdateServerCert();
GotoState(STATE_VERIFY_CERT);
} else {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/424386 is fixed.
- tracked_objects::ScopedTracker tracking_profile4(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "424386 SSLClientSocketOpenSSL::DoHandshake4"));
-
if (client_auth_cert_needed_)
return ERR_SSL_CLIENT_AUTH_CERT_NEEDED;
@@ -1190,19 +1168,8 @@ void SSLClientSocketOpenSSL::DoConnectCallback(int rv) {
}
void SSLClientSocketOpenSSL::UpdateServerCert() {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/424386 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "424386 SSLClientSocketOpenSSL::UpdateServerCert"));
-
server_cert_chain_->Reset(SSL_get_peer_cert_chain(ssl_));
-
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/424386 is fixed.
- tracked_objects::ScopedTracker tracking_profile1(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "424386 SSLClientSocketOpenSSL::UpdateServerCert1"));
server_cert_ = server_cert_chain_->AsOSChain();
-
if (server_cert_.get()) {
net_log_.AddEvent(
NetLog::TYPE_SSL_CERTIFICATES_RECEIVED,
@@ -1213,12 +1180,6 @@ void SSLClientSocketOpenSSL::UpdateServerCert() {
// update IsOCSPStaplingSupported for Mac. https://crbug.com/430714
if (IsOCSPStaplingSupported()) {
#if defined(OS_WIN)
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/424386 is
- // fixed.
- tracked_objects::ScopedTracker tracking_profile2(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "424386 SSLClientSocketOpenSSL::UpdateServerCert2"));
-
const uint8_t* ocsp_response_raw;
size_t ocsp_response_len;
SSL_get0_ocsp_response(ssl_, &ocsp_response_raw, &ocsp_response_len);
@@ -1663,11 +1624,6 @@ int SSLClientSocketOpenSSL::TransportReadComplete(int result) {
}
int SSLClientSocketOpenSSL::ClientCertRequestCallback(SSL* ssl) {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/424386 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "424386 SSLClientSocketOpenSSL::ClientCertRequestCallback"));
-
DVLOG(3) << "OpenSSL ClientCertRequestCallback called";
DCHECK(ssl == ssl_);
@@ -1765,11 +1721,6 @@ int SSLClientSocketOpenSSL::ClientCertRequestCallback(SSL* ssl) {
}
int SSLClientSocketOpenSSL::CertVerifyCallback(X509_STORE_CTX* store_ctx) {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/424386 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "424386 SSLClientSocketOpenSSL::CertVerifyCallback"));
-
if (!completed_connect_) {
// If the first handshake hasn't completed then we accept any certificates
// because we verify after the handshake.
@@ -1804,11 +1755,6 @@ int SSLClientSocketOpenSSL::SelectNextProtoCallback(unsigned char** out,
unsigned char* outlen,
const unsigned char* in,
unsigned int inlen) {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/424386 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "424386 SSLClientSocketOpenSSL::SelectNextProtoCallback"));
-
if (ssl_config_.next_protos.empty()) {
*out = reinterpret_cast<uint8*>(
const_cast<char*>(kDefaultSupportedNPNProtocol));
@@ -1889,11 +1835,6 @@ long SSLClientSocketOpenSSL::BIOCallback(
int cmd,
const char *argp, int argi, long argl,
long retvalue) {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/424386 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "424386 SSLClientSocketOpenSSL::BIOCallback"));
-
SSLClientSocketOpenSSL* socket = reinterpret_cast<SSLClientSocketOpenSSL*>(
BIO_get_callback_arg(bio));
CHECK(socket);
diff --git a/net/socket/ssl_client_socket_pool.cc b/net/socket/ssl_client_socket_pool.cc
index bf2d1a3..24c64c0 100644
--- a/net/socket/ssl_client_socket_pool.cc
+++ b/net/socket/ssl_client_socket_pool.cc
@@ -9,6 +9,7 @@
#include "base/metrics/field_trial.h"
#include "base/metrics/histogram.h"
#include "base/metrics/sparse_histogram.h"
+#include "base/profiler/scoped_tracker.h"
#include "base/values.h"
#include "net/base/host_port_pair.h"
#include "net/base/net_errors.h"
diff --git a/net/socket/ssl_session_cache_openssl.cc b/net/socket/ssl_session_cache_openssl.cc
index 9f7a37b..3e0879c 100644
--- a/net/socket/ssl_session_cache_openssl.cc
+++ b/net/socket/ssl_session_cache_openssl.cc
@@ -13,7 +13,6 @@
#include "base/containers/hash_tables.h"
#include "base/lazy_instance.h"
#include "base/logging.h"
-#include "base/profiler/scoped_tracker.h"
#include "base/synchronization/lock.h"
namespace net {
@@ -157,11 +156,6 @@ class SSLSessionCacheOpenSSLImpl {
SSLSessionCacheOpenSSLImpl(SSL_CTX* ctx,
const SSLSessionCacheOpenSSL::Config& config)
: ctx_(ctx), config_(config), expiration_check_(0) {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/424386 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "424386 SSLSessionCacheOpenSSLImpl::SSLSessionCacheOpenSSLImpl"));
-
DCHECK(ctx);
// NO_INTERNAL_STORE disables OpenSSL's builtin cache, and
@@ -202,11 +196,6 @@ class SSLSessionCacheOpenSSLImpl {
//
// Return true if a cached session ID was found, false otherwise.
bool SetSSLSession(SSL* ssl) {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/424386 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "424386 SSLSessionCacheOpenSSLImpl::SetSSLSession"));
-
std::string cache_key = config_.key_func(ssl);
if (cache_key.empty())
return false;
@@ -217,11 +206,6 @@ class SSLSessionCacheOpenSSLImpl {
// Variant of SetSSLSession to be used when the client already has computed
// the cache key. Avoid a call to the configuration's |key_func| function.
bool SetSSLSessionWithKey(SSL* ssl, const std::string& cache_key) {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/424386 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "424386 SSLSessionCacheOpenSSLImpl::SetSSLSessionWithKey"));
-
base::AutoLock locked(lock_);
DCHECK_EQ(config_.key_func(ssl), cache_key);
@@ -254,11 +238,6 @@ class SSLSessionCacheOpenSSLImpl {
}
void MarkSSLSessionAsGood(SSL* ssl) {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/424386 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "424386 SSLSessionCacheOpenSSLImpl::MarkSSLSessionAsGood"));
-
SSL_SESSION* session = SSL_get_session(ssl);
if (!session)
return;
@@ -270,11 +249,6 @@ class SSLSessionCacheOpenSSLImpl {
// Flush all entries from the cache.
void Flush() {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/424386 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "424386 SSLSessionCacheOpenSSLImpl::Flush"));
-
base::AutoLock lock(lock_);
id_index_.clear();
key_index_.clear();
@@ -369,11 +343,6 @@ class SSLSessionCacheOpenSSLImpl {
// to indicate that it took ownership of the session, i.e. that the caller
// should not decrement its reference count after completion.
static int NewSessionCallbackStatic(SSL* ssl, SSL_SESSION* session) {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/424386 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "424386 SSLSessionCacheOpenSSLImpl::NewSessionCallbackStatic"));
-
GetCache(ssl->ctx)->OnSessionAdded(ssl, session);
return 1;
}
@@ -381,11 +350,6 @@ class SSLSessionCacheOpenSSLImpl {
// Called by OpenSSL to indicate that a session must be removed from the
// cache. This happens when SSL_CTX is destroyed.
static void RemoveSessionCallbackStatic(SSL_CTX* ctx, SSL_SESSION* session) {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/424386 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "424386 SSLSessionCacheOpenSSLImpl::RemoveSessionCallbackStatic"));
-
GetCache(ctx)->OnSessionRemoved(session);
}
@@ -407,11 +371,6 @@ class SSLSessionCacheOpenSSLImpl {
static int GenerateSessionIdStatic(const SSL* ssl,
unsigned char* id,
unsigned* id_len) {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/424386 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "424386 SSLSessionCacheOpenSSLImpl::GenerateSessionIdStatic"));
-
if (!GetCache(ssl->ctx)->OnGenerateSessionId(id, *id_len))
return 0;
diff --git a/net/socket/tcp_client_socket.cc b/net/socket/tcp_client_socket.cc
index d2241c0..4a72bdf 100644
--- a/net/socket/tcp_client_socket.cc
+++ b/net/socket/tcp_client_socket.cc
@@ -63,10 +63,6 @@ int TCPClientSocket::Bind(const IPEndPoint& address) {
}
int TCPClientSocket::Connect(const CompletionCallback& callback) {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/436634 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION("436634 TCPClientSocket::Connect"));
-
DCHECK(!callback.is_null());
// If connecting or already connected, then just return OK.
@@ -116,42 +112,40 @@ int TCPClientSocket::DoConnectLoop(int result) {
}
int TCPClientSocket::DoConnect() {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/436634 is fixed.
- tracked_objects::ScopedTracker tracking_profile1(
- FROM_HERE_WITH_EXPLICIT_FUNCTION("436634 TCPClientSocket::DoConnect1"));
-
DCHECK_GE(current_address_index_, 0);
DCHECK_LT(current_address_index_, static_cast<int>(addresses_.size()));
const IPEndPoint& endpoint = addresses_[current_address_index_];
- if (previously_disconnected_) {
- use_history_.Reset();
- previously_disconnected_ = false;
- }
+ {
+ // TODO(ricea): Remove ScopedTracker below once crbug.com/436634 is fixed.
+ tracked_objects::ScopedTracker tracking_profile(
+ FROM_HERE_WITH_EXPLICIT_FUNCTION("436634 TCPClientSocket::DoConnect"));
- next_connect_state_ = CONNECT_STATE_CONNECT_COMPLETE;
+ if (previously_disconnected_) {
+ use_history_.Reset();
+ previously_disconnected_ = false;
+ }
- if (socket_->IsValid()) {
- DCHECK(bind_address_);
- } else {
- int result = OpenSocket(endpoint.GetFamily());
- if (result != OK)
- return result;
+ next_connect_state_ = CONNECT_STATE_CONNECT_COMPLETE;
- if (bind_address_) {
- result = socket_->Bind(*bind_address_);
- if (result != OK) {
- socket_->Close();
+ if (socket_->IsValid()) {
+ DCHECK(bind_address_);
+ } else {
+ int result = OpenSocket(endpoint.GetFamily());
+ if (result != OK)
return result;
+
+ if (bind_address_) {
+ result = socket_->Bind(*bind_address_);
+ if (result != OK) {
+ socket_->Close();
+ return result;
+ }
}
}
}
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/436634 is fixed.
- tracked_objects::ScopedTracker tracking_profile2(
- FROM_HERE_WITH_EXPLICIT_FUNCTION("436634 TCPClientSocket::DoConnect2"));
-
// |socket_| is owned by this class and the callback won't be run once
// |socket_| is gone. Therefore, it is safe to use base::Unretained() here.
return socket_->Connect(endpoint,
@@ -160,11 +154,6 @@ int TCPClientSocket::DoConnect() {
}
int TCPClientSocket::DoConnectComplete(int result) {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/436634 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "436634 TCPClientSocket::DoConnectComplete"));
-
if (result == OK) {
use_history_.set_was_ever_connected();
return OK; // Done!
diff --git a/net/socket/tcp_socket_win.cc b/net/socket/tcp_socket_win.cc
index acbaa0d..6d84fd4 100644
--- a/net/socket/tcp_socket_win.cc
+++ b/net/socket/tcp_socket_win.cc
@@ -414,10 +414,6 @@ int TCPSocketWin::Accept(scoped_ptr<TCPSocketWin>* socket,
int TCPSocketWin::Connect(const IPEndPoint& address,
const CompletionCallback& callback) {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/436634 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION("436634 TCPSocketWin::Connect"));
-
DCHECK(CalledOnValidThread());
DCHECK_NE(socket_, INVALID_SOCKET);
DCHECK(!waiting_connect_);
@@ -781,10 +777,6 @@ void TCPSocketWin::OnObjectSignaled(HANDLE object) {
}
int TCPSocketWin::DoConnect() {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/436634 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION("436634 TCPSocketWin::DoConnect"));
-
DCHECK_EQ(connect_os_error_, 0);
DCHECK(!core_.get());
@@ -793,10 +785,6 @@ int TCPSocketWin::DoConnect() {
core_ = new Core(this);
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/436634 is fixed.
- tracked_objects::ScopedTracker tracking_profile1(
- FROM_HERE_WITH_EXPLICIT_FUNCTION("436634 TCPSocketWin::DoConnect1"));
-
// WSAEventSelect sets the socket to non-blocking mode as a side effect.
// Our connect() and recv() calls require that the socket be non-blocking.
WSAEventSelect(socket_, core_->read_overlapped_.hEvent, FD_CONNECT);
@@ -805,15 +793,15 @@ int TCPSocketWin::DoConnect() {
if (!peer_address_->ToSockAddr(storage.addr, &storage.addr_len))
return ERR_ADDRESS_INVALID;
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/436634 is fixed.
- tracked_objects::ScopedTracker tracking_profile2(
- FROM_HERE_WITH_EXPLICIT_FUNCTION("436634 TCPSocketWin::DoConnect2"));
-
- if (!connect(socket_, storage.addr, storage.addr_len)) {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/436634 is fixed.
- tracked_objects::ScopedTracker tracking_profile3(
- FROM_HERE_WITH_EXPLICIT_FUNCTION("436634 TCPSocketWin::DoConnect3"));
+ int result;
+ {
+ // TODO(ricea): Remove ScopedTracker below once crbug.com/436634 is fixed.
+ tracked_objects::ScopedTracker tracking_profile(
+ FROM_HERE_WITH_EXPLICIT_FUNCTION("436634 connect()"));
+ result = connect(socket_, storage.addr, storage.addr_len);
+ }
+ if (!result) {
// Connected without waiting!
//
// The MSDN page for connect says:
@@ -830,11 +818,6 @@ int TCPSocketWin::DoConnect() {
return OK;
} else {
int os_error = WSAGetLastError();
-
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/436634 is fixed.
- tracked_objects::ScopedTracker tracking_profile4(
- FROM_HERE_WITH_EXPLICIT_FUNCTION("436634 TCPSocketWin::DoConnect4"));
-
if (os_error != WSAEWOULDBLOCK) {
LOG(ERROR) << "connect failed: " << os_error;
connect_os_error_ = os_error;
@@ -844,9 +827,9 @@ int TCPSocketWin::DoConnect() {
}
}
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/436634 is fixed.
- tracked_objects::ScopedTracker tracking_profile5(
- FROM_HERE_WITH_EXPLICIT_FUNCTION("436634 TCPSocketWin::DoConnect5"));
+ // TODO(ricea): Remove ScopedTracker below once crbug.com/436634 is fixed.
+ tracked_objects::ScopedTracker tracking_profile(
+ FROM_HERE_WITH_EXPLICIT_FUNCTION("436634 WatchForRead()"));
core_->WatchForRead();
return ERR_IO_PENDING;
diff --git a/net/socket/transport_client_socket_pool.cc b/net/socket/transport_client_socket_pool.cc
index d651751..eac2868 100644
--- a/net/socket/transport_client_socket_pool.cc
+++ b/net/socket/transport_client_socket_pool.cc
@@ -11,6 +11,7 @@
#include "base/logging.h"
#include "base/message_loop/message_loop.h"
#include "base/metrics/histogram.h"
+#include "base/profiler/scoped_tracker.h"
#include "base/strings/string_util.h"
#include "base/synchronization/lock.h"
#include "base/time/time.h"
@@ -238,7 +239,7 @@ void TransportConnectJob::MakeAddressListStartWithIPv4(AddressList* list) {
}
int TransportConnectJob::DoResolveHost() {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/436634 is fixed.
+ // TODO(ricea): Remove ScopedTracker below once crbug.com/436634 is fixed.
tracked_objects::ScopedTracker tracking_profile(
FROM_HERE_WITH_EXPLICIT_FUNCTION(
"436634 TransportConnectJob::DoResolveHost"));
@@ -247,20 +248,10 @@ int TransportConnectJob::DoResolveHost() {
}
int TransportConnectJob::DoResolveHostComplete(int result) {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/436634 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "436634 TransportConnectJob::DoResolveHostComplete"));
-
return helper_.DoResolveHostComplete(result, net_log());
}
int TransportConnectJob::DoTransportConnect() {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/436634 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "436634 TransportConnectJob::DoTransportConnect"));
-
base::TimeTicks now = base::TimeTicks::Now();
base::TimeTicks last_connect_time;
{
@@ -280,11 +271,6 @@ int TransportConnectJob::DoTransportConnect() {
interval_between_connects_ = CONNECT_INTERVAL_GT_20MS;
}
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/436634 is fixed.
- tracked_objects::ScopedTracker tracking_profile1(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "436634 TransportConnectJob::DoTransportConnect1"));
-
helper_.set_next_state(
TransportConnectJobHelper::STATE_TRANSPORT_CONNECT_COMPLETE);
transport_socket_ =
@@ -307,18 +293,7 @@ int TransportConnectJob::DoTransportConnect() {
transport_socket_->EnableTCPFastOpenIfSupported();
}
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/436634 is fixed.
- tracked_objects::ScopedTracker tracking_profile2(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "436634 TransportConnectJob::DoTransportConnect2"));
-
int rv = transport_socket_->Connect(helper_.on_io_complete());
-
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/436634 is fixed.
- tracked_objects::ScopedTracker tracking_profile3(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "436634 TransportConnectJob::DoTransportConnect3"));
-
if (rv == ERR_IO_PENDING && try_ipv6_connect_with_ipv4_fallback) {
fallback_timer_.Start(
FROM_HERE,
@@ -331,11 +306,6 @@ int TransportConnectJob::DoTransportConnect() {
}
int TransportConnectJob::DoTransportConnectComplete(int result) {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/436634 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "436634 TransportConnectJob::DoTransportConnectComplete"));
-
if (result == OK) {
bool is_ipv4 =
helper_.addresses().front().GetFamily() == ADDRESS_FAMILY_IPV4;
diff --git a/net/socket/transport_client_socket_pool.h b/net/socket/transport_client_socket_pool.h
index cb51d84..48ddd13 100644
--- a/net/socket/transport_client_socket_pool.h
+++ b/net/socket/transport_client_socket_pool.h
@@ -10,7 +10,6 @@
#include "base/basictypes.h"
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
-#include "base/profiler/scoped_tracker.h"
#include "base/time/time.h"
#include "base/timer/timer.h"
#include "net/base/host_port_pair.h"
@@ -317,18 +316,7 @@ void TransportConnectJobHelper::SetOnIOComplete(T* job) {
template <class T>
void TransportConnectJobHelper::OnIOComplete(T* job, int result) {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/436634 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "436634 TransportConnectJobHelper::OnIOComplete"));
-
result = this->DoLoop(job, result);
-
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/436634 is fixed.
- tracked_objects::ScopedTracker tracking_profile1(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "436634 TransportConnectJobHelper::OnIOComplete1"));
-
if (result != ERR_IO_PENDING)
job->NotifyDelegateOfCompletion(result); // Deletes |job| and |this|
}
diff --git a/net/socket/websocket_transport_client_socket_pool.cc b/net/socket/websocket_transport_client_socket_pool.cc
index f01a4e8..ce43368 100644
--- a/net/socket/websocket_transport_client_socket_pool.cc
+++ b/net/socket/websocket_transport_client_socket_pool.cc
@@ -9,7 +9,6 @@
#include "base/compiler_specific.h"
#include "base/logging.h"
#include "base/numerics/safe_conversions.h"
-#include "base/profiler/scoped_tracker.h"
#include "base/strings/string_util.h"
#include "base/time/time.h"
#include "base/values.h"
@@ -623,11 +622,6 @@ void
WebSocketTransportClientSocketPool::ConnectJobDelegate::OnConnectJobComplete(
int result,
ConnectJob* job) {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/436634 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "436634 WebSocket...::ConnectJobDelegate::OnConnectJobComplete"));
-
owner_->OnConnectJobComplete(result,
static_cast<WebSocketTransportConnectJob*>(job));
}
diff --git a/net/ssl/openssl_platform_key_win.cc b/net/ssl/openssl_platform_key_win.cc
index 479e50b..c250581 100644
--- a/net/ssl/openssl_platform_key_win.cc
+++ b/net/ssl/openssl_platform_key_win.cc
@@ -29,7 +29,6 @@
#include "base/lazy_instance.h"
#include "base/logging.h"
#include "base/memory/scoped_ptr.h"
-#include "base/profiler/scoped_tracker.h"
#include "base/win/windows_version.h"
#include "crypto/openssl_util.h"
#include "crypto/scoped_capi_types.h"
@@ -229,10 +228,6 @@ int RsaMethodSign(int hash_nid,
uint8_t* out,
unsigned* out_len,
const RSA* rsa) {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/424386 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION("424386 RsaMethodSign"));
-
// TODO(davidben): Switch BoringSSL's sign hook to using size_t rather than
// unsigned.
const KeyExData* ex_data = RsaGetExData(rsa);
@@ -460,10 +455,6 @@ int EcdsaMethodSign(const uint8_t* digest,
uint8_t* out_sig,
unsigned int* out_sig_len,
EC_KEY* ec_key) {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/424386 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION("424386 EcdsaMethodSign"));
-
const KeyExData* ex_data = EcKeyGetExData(ec_key);
// Only CNG supports ECDSA.
if (!ex_data || ex_data->key->dwKeySpec != CERT_NCRYPT_KEY_SPEC) {
diff --git a/net/tools/dump_cache/simple_cache_dumper.cc b/net/tools/dump_cache/simple_cache_dumper.cc
index 9be140d..dd5ecbf 100644
--- a/net/tools/dump_cache/simple_cache_dumper.cc
+++ b/net/tools/dump_cache/simple_cache_dumper.cc
@@ -10,7 +10,6 @@
#include "base/memory/scoped_ptr.h"
#include "base/message_loop/message_loop.h"
#include "base/message_loop/message_loop_proxy.h"
-#include "base/profiler/scoped_tracker.h"
#include "base/threading/thread.h"
#include "net/base/cache_type.h"
#include "net/base/io_buffer.h"
@@ -261,11 +260,6 @@ int SimpleCacheDumper::DoWriteBodyComplete(int rv) {
}
void SimpleCacheDumper::OnIOComplete(int rv) {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "422516 SimpleCacheDumper::OnIOComplete"));
-
rv = DoLoop(rv);
if (rv != ERR_IO_PENDING) {
diff --git a/net/url_request/view_cache_helper.cc b/net/url_request/view_cache_helper.cc
index 594f739..36d3ae5 100644
--- a/net/url_request/view_cache_helper.cc
+++ b/net/url_request/view_cache_helper.cc
@@ -6,7 +6,6 @@
#include "base/bind.h"
#include "base/bind_helpers.h"
-#include "base/profiler/scoped_tracker.h"
#include "base/strings/stringprintf.h"
#include "net/base/escape.h"
#include "net/base/io_buffer.h"
@@ -363,10 +362,6 @@ int ViewCacheHelper::DoReadDataComplete(int result) {
}
void ViewCacheHelper::OnIOComplete(int result) {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION("422516 ViewCacheHelper::OnIOComplete"));
-
DoLoop(result);
}