| 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,
|
|
|