Index: chrome/browser/profiles/profile_io_data.cc |
diff --git a/chrome/browser/profiles/profile_io_data.cc b/chrome/browser/profiles/profile_io_data.cc |
index 8457344dfe9036313e06de4c6e95ecebdc19a02c..88ea1699910113ac21128afd5cf48e0e2c33a132 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( |