| 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 98f1e6d2a593d401e6ed2640147f1b2b04c8c185..6bab0fe08c25dedb3a6b4a1ebd9284d21f9db22c 100644
|
| --- a/chrome/browser/profiles/profile_io_data.cc
|
| +++ b/chrome/browser/profiles/profile_io_data.cc
|
| @@ -1023,10 +1023,18 @@ void ProfileIOData::Init(
|
| IOThread::Globals* const io_thread_globals = io_thread->globals();
|
| const CommandLine& command_line = *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)
|
| @@ -1056,6 +1064,10 @@ 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(
|
| @@ -1074,6 +1086,10 @@ 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;
|
| @@ -1117,6 +1133,10 @@ 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"));
|
| +
|
| InitializeInternal(
|
| network_delegate.Pass(), profile_params_.get(),
|
| protocol_handlers, request_interceptors.Pass());
|
|
|