Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(591)

Unified Diff: chrome/browser/net/proxy_service_factory.cc

Issue 993703002: Remove some jank tracking instrumentation which is now accounted for. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | net/proxy/proxy_config_service_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/net/proxy_service_factory.cc
diff --git a/chrome/browser/net/proxy_service_factory.cc b/chrome/browser/net/proxy_service_factory.cc
index a8a79b5d063775d5eec782f5615a4dbd1c3d94ea..ceaef642cf8db623a2b4b257b8423728dc54152b 100644
--- a/chrome/browser/net/proxy_service_factory.cc
+++ b/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,
« no previous file with comments | « no previous file | net/proxy/proxy_config_service_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698