Remove some jank tracking instrumentation which is now accounted for.

chrome/browser/net/proxy_service_factory.cc

 // Copyright (c) 2012 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/proxy_service_factory.h"
 
 #include "base/command_line.h"
-#include "base/profiler/scoped_tracker.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/threading/thread.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/io_thread.h"
 #include "chrome/browser/net/pref_proxy_config_tracker_impl.h"
 #include "chrome/common/chrome_switches.h"
 #include "content/public/browser/browser_thread.h"
 #include "net/base/net_log.h"
 #include "net/proxy/dhcp_proxy_script_fetcher_factory.h"
 #include "net/proxy/proxy_config_service.h"
@@ skipping 68 matching lines @@
 
 // static
 net::ProxyService* ProxyServiceFactory::CreateProxyService(
     net::NetLog* net_log,
     net::URLRequestContext* context,
     net::NetworkDelegate* network_delegate,
     net::ProxyConfigService* proxy_config_service,
     const base::CommandLine& command_line,
     bool quick_check_enabled) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
-
-  // TODO(michaeln): Remove ScopedTracker below once crbug.com/454983 is fixed.
-  tracked_objects::ScopedTracker tracking_profile(
-      FROM_HERE_WITH_EXPLICIT_FUNCTION(
-          "454983 ProxyServiceFactory::CreateProxyService"));
-
 #if defined(OS_IOS)
   bool use_v8 = false;
 #else
   bool use_v8 = !command_line.HasSwitch(switches::kWinHttpProxyResolver);
 #endif  // defined(OS_IOS)
 
   size_t num_pac_threads = 0u;  // Use default number of threads.
 
   // Check the command line for an override on the number of proxy resolver
   // threads to use.
   if (command_line.HasSwitch(switches::kNumPacThreads)) {
     std::string s = command_line.GetSwitchValueASCII(switches::kNumPacThreads);
 
     // Parse the switch (it should be a positive integer formatted as decimal).
     int n;
     if (base::StringToInt(s, &n) && n > 0) {
       num_pac_threads = static_cast<size_t>(n);
     } else {
       LOG(ERROR) << "Invalid switch for number of PAC threads: " << s;
     }
   }
 
-  // TODO(eroman): Remove once crbug.com/454983 is fixed.
-  tracked_objects::ScopedTracker tracking_profile2(
-      FROM_HERE_WITH_EXPLICIT_FUNCTION(
-          "454983 ProxyServiceFactory::CreateProxyService_2"));
-
   net::ProxyService* proxy_service = NULL;
   if (use_v8) {
-    // TODO(eroman): Remove once crbug.com/454983 is fixed.
-    tracked_objects::ScopedTracker tracking_profile3(
-        FROM_HERE_WITH_EXPLICIT_FUNCTION(
-            "454983 ProxyServiceFactory::CreateProxyService_3"));
-
 #if defined(OS_IOS)
     NOTREACHED();
 #else
     net::DhcpProxyScriptFetcher* dhcp_proxy_script_fetcher;
 #if defined(OS_CHROMEOS)
     dhcp_proxy_script_fetcher =
         new chromeos::DhcpProxyScriptFetcherChromeos(context);
 #else
     net::DhcpProxyScriptFetcherFactory dhcp_factory;
     dhcp_proxy_script_fetcher = dhcp_factory.Create(context);
 #endif
 
-    // TODO(eroman): Remove once crbug.com/454983 is fixed.
-    tracked_objects::ScopedTracker tracking_profile4(
-        FROM_HERE_WITH_EXPLICIT_FUNCTION(
-            "454983 ProxyServiceFactory::CreateProxyService_4"));
-
     proxy_service = net::CreateProxyServiceUsingV8ProxyResolver(
         proxy_config_service,
         new net::ProxyScriptFetcherImpl(context),
         dhcp_proxy_script_fetcher,
         context->host_resolver(),
         net_log,
         network_delegate);
 #endif  // defined(OS_IOS)
   } else {
-    // TODO(eroman): Remove once crbug.com/454983 is fixed.
-    tracked_objects::ScopedTracker tracking_profile5(
-        FROM_HERE_WITH_EXPLICIT_FUNCTION(
-            "454983 ProxyServiceFactory::CreateProxyService_5"));
-
     proxy_service = net::ProxyService::CreateUsingSystemProxyResolver(
         proxy_config_service,
         num_pac_threads,
         net_log);
   }
 
   proxy_service->set_quick_check_enabled(quick_check_enabled);
 
   return proxy_service;
 }