Remove unnecessary instrumentation for several jank bugs.

chrome/browser/net/chrome_url_request_context_getter.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/net/chrome_url_request_context_getter.h"
 
 #include "base/bind.h"
 #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"
 #include "chrome/browser/profiles/profile_io_data.h"
 #include "chrome/browser/profiles/storage_partition_descriptor.h"
 #include "content/public/browser/browser_thread.h"
 #include "net/cookies/cookie_store.h"
 
 using content::BrowserThread;
 
@@ skipping 21 matching lines @@
   FactoryForMain(
       const ProfileIOData* profile_io_data,
       content::ProtocolHandlerMap* protocol_handlers,
       content::URLRequestInterceptorScopedVector request_interceptors)
       : profile_io_data_(profile_io_data),
         request_interceptors_(request_interceptors.Pass()) {
     std::swap(protocol_handlers_, *protocol_handlers);
   }
 
   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();
   }
 
  private:
   const ProfileIOData* const profile_io_data_;
   content::ProtocolHandlerMap protocol_handlers_;
   content::URLRequestInterceptorScopedVector request_interceptors_;
 };
 
 // Factory that creates the URLRequestContext for extensions.
 class FactoryForExtensions : public ChromeURLRequestContextFactory {
  public:
   explicit FactoryForExtensions(const ProfileIOData* profile_io_data)
       : 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();
   }
 
  private:
   const ProfileIOData* const profile_io_data_;
 };
 
 // Factory that creates the URLRequestContext for a given isolated app.
 class FactoryForIsolatedApp : public ChromeURLRequestContextFactory {
  public:
   FactoryForIsolatedApp(
       const ProfileIOData* profile_io_data,
       const StoragePartitionDescriptor& partition_descriptor,
       ChromeURLRequestContextGetter* main_context,
       scoped_ptr<ProtocolHandlerRegistry::JobInterceptorFactory>
           protocol_handler_interceptor,
       content::ProtocolHandlerMap* protocol_handlers,
       content::URLRequestInterceptorScopedVector request_interceptors)
       : profile_io_data_(profile_io_data),
         partition_descriptor_(partition_descriptor),
         main_request_context_getter_(main_context),
         protocol_handler_interceptor_(protocol_handler_interceptor.Pass()),
         request_interceptors_(request_interceptors.Pass()) {
     std::swap(protocol_handlers_, *protocol_handlers);
   }
 
   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
     // factory is actually destroyed. Thus it is safe to destructively pass
     // state onwards.
     return profile_io_data_->GetIsolatedAppRequestContext(
         main_request_context_getter_->GetURLRequestContext(),
         partition_descriptor_,
         protocol_handler_interceptor_.Pass(),
         &protocol_handlers_,
@@ skipping 17 matching lines @@
  public:
   FactoryForIsolatedMedia(
       const ProfileIOData* profile_io_data,
       const StoragePartitionDescriptor& partition_descriptor,
       ChromeURLRequestContextGetter* app_context)
     : profile_io_data_(profile_io_data),
       partition_descriptor_(partition_descriptor),
       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
     // all its backing objects, including the
     // |protocol_handler_interceptor|.  This is why the API
     // looks different from FactoryForIsolatedApp's.
     return profile_io_data_->GetIsolatedMediaRequestContext(
         app_context_getter_->GetURLRequestContext(), partition_descriptor_);
   }
 
  private:
   const ProfileIOData* const profile_io_data_;
   const StoragePartitionDescriptor partition_descriptor_;
   scoped_refptr<ChromeURLRequestContextGetter> app_context_getter_;
 };
 
 // Factory that creates the URLRequestContext for media.
 class FactoryForMedia : public ChromeURLRequestContextFactory {
  public:
   explicit FactoryForMedia(const ProfileIOData* profile_io_data)
       : 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 FactoryForMedia::Create"));
-
     return profile_io_data_->GetMediaRequestContext();
   }
 
  private:
   const ProfileIOData* const profile_io_data_;
 };
 
 }  // namespace
 
 // ----------------------------------------------------------------------------
 // ChromeURLRequestContextGetter
 // ----------------------------------------------------------------------------
 
 ChromeURLRequestContextGetter::ChromeURLRequestContextGetter(
     ChromeURLRequestContextFactory* factory)
     : factory_(factory),
       url_request_context_(NULL) {
   DCHECK(factory);
 }
 
 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()) {
     DCHECK(!url_request_context_);
     url_request_context_ = factory_->Create();
     factory_.reset();
   }
 
   // Context reference is valid, unless we're trying to use the
   // URLRequestContextGetter after the Profile has already been deleted.
@@ skipping 64 matching lines @@
 ChromeURLRequestContextGetter*
 ChromeURLRequestContextGetter::CreateForIsolatedMedia(
     Profile* profile,
     ChromeURLRequestContextGetter* app_context,
     const ProfileIOData* profile_io_data,
     const StoragePartitionDescriptor& partition_descriptor) {
   return new ChromeURLRequestContextGetter(
       new FactoryForIsolatedMedia(
           profile_io_data, partition_descriptor, app_context));
 }