Remove unnecessary instrumentation for several jank bugs.

net/base/network_change_notifier_win.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 "net/base/network_change_notifier_win.h"
 
 #include <iphlpapi.h>
 #include <winsock2.h>
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
-#include "base/profiler/scoped_tracker.h"
 #include "base/threading/thread.h"
 #include "base/time/time.h"
 #include "net/base/winsock_init.h"
 #include "net/dns/dns_config_service.h"
 
 #pragma comment(lib, "iphlpapi.lib")
 
 namespace net {
 
 namespace {
@@ skipping 177 matching lines @@
   LOG_IF(ERROR, result != 0)
       << "WSALookupServiceEnd() failed with: " << result;
 
   // TODO(droger): Return something more detailed than CONNECTION_UNKNOWN.
   return found_connection ? NetworkChangeNotifier::CONNECTION_UNKNOWN :
                             NetworkChangeNotifier::CONNECTION_NONE;
 }
 
 NetworkChangeNotifier::ConnectionType
 NetworkChangeNotifierWin::GetCurrentConnectionType() const {
-  // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed.
-  tracked_objects::ScopedTracker tracking_profile(
-      FROM_HERE_WITH_EXPLICIT_FUNCTION(
-          "422516 NetworkChangeNotifierWin::GetCurrentConnectionType"));
-
   base::AutoLock auto_lock(last_computed_connection_type_lock_);
   return last_computed_connection_type_;
 }
 
 void NetworkChangeNotifierWin::SetCurrentConnectionType(
     ConnectionType connection_type) {
   base::AutoLock auto_lock(last_computed_connection_type_lock_);
   last_computed_connection_type_ = connection_type;
 }
 
@@ skipping 98 matching lines @@
     return;
   }
   if (last_announced_offline_)
     UMA_HISTOGRAM_CUSTOM_COUNTS("NCN.OfflinePolls", offline_polls_, 1, 50, 50);
   last_announced_offline_ = current_offline;
 
   NotifyObserversOfConnectionTypeChange();
 }
 
 }  // namespace net