Remove some jank tracking instrumentation which is now accounted for.

BUG=454983

Review URL: https://codereview.chromium.org/993703002

Cr-Commit-Position: refs/heads/master@{#319745}

chrome/browser/net/proxy_service_factory.cc

@@ -5,7 +5,6 @@
 #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"
@@ -94,12 +93,6 @@ net::ProxyService* ProxyServiceFactory::CreateProxyService(
     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
@@ -122,18 +115,8 @@ net::ProxyService* ProxyServiceFactory::CreateProxyService(
     }
   }
 
-  // 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
@@ -146,11 +129,6 @@ net::ProxyService* ProxyServiceFactory::CreateProxyService(
     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),
@@ -160,11 +138,6 @@ net::ProxyService* ProxyServiceFactory::CreateProxyService(
         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/proxy/proxy_config_service_win.cc

@@ -11,7 +11,6 @@
 #include "base/bind_helpers.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
-#include "base/profiler/scoped_tracker.h"
 #include "base/stl_util.h"
 #include "base/strings/string_tokenizer.h"
 #include "base/strings/string_util.h"
@@ -63,11 +62,6 @@ void ProxyConfigServiceWin::AddObserver(Observer* observer) {
 }
 
 void ProxyConfigServiceWin::StartWatchingRegistryForChanges() {
-  // TODO(eroman): Remove once crbug.com/454983 is solved.
-  tracked_objects::ScopedTracker tracking_profile(
-      FROM_HERE_WITH_EXPLICIT_FUNCTION(
-          "454983 ProxyConfigServiceWin::StartWatchingRegistryForChanges"));
-
   if (!keys_to_watch_.empty())
     return;  // Already initialized.
 

net/proxy/proxy_service.cc

@@ -904,9 +904,6 @@ ProxyService::ProxyService(ProxyConfigService* config_service,
       stall_proxy_auto_config_delay_(TimeDelta::FromMilliseconds(
           kDelayAfterNetworkChangesMs)),
       quick_check_enabled_(true) {
-  // TODO(eroman): Remove once crbug.com/454983 is solved.
-  tracked_objects::ScopedTracker tracking_profile(
-      FROM_HERE_WITH_EXPLICIT_FUNCTION("454983 ProxyService::ProxyService"));
   NetworkChangeNotifier::AddIPAddressObserver(this);
   NetworkChangeNotifier::AddDNSObserver(this);
   ResetConfigService(config_service);
@@ -1392,10 +1389,6 @@ int ProxyService::DidFinishResolvingProxy(const GURL& url,
 void ProxyService::SetProxyScriptFetchers(
     ProxyScriptFetcher* proxy_script_fetcher,
     DhcpProxyScriptFetcher* dhcp_proxy_script_fetcher) {
-  // TODO(eroman): Remove once crbug.com/454983 is fixed.
-  tracked_objects::ScopedTracker tracking_profile(
-      FROM_HERE_WITH_EXPLICIT_FUNCTION(
-          "454983 ProxyService::SetProxyScriptFetchers"));
   DCHECK(CalledOnValidThread());
   State previous_state = ResetProxyConfig(false);
   proxy_script_fetcher_.reset(proxy_script_fetcher);
@@ -1428,11 +1421,6 @@ ProxyService::State ProxyService::ResetProxyConfig(bool reset_fetched_config) {
 
 void ProxyService::ResetConfigService(
     ProxyConfigService* new_proxy_config_service) {
-  // TODO(eroman): Remove once crbug.com/454983 is solved.
-  tracked_objects::ScopedTracker tracking_profile(
-      FROM_HERE_WITH_EXPLICIT_FUNCTION(
-          "454983 ProxyService::ResetConfigService"));
-
   DCHECK(CalledOnValidThread());
   State previous_state = ResetProxyConfig(true);