Skip to content

GitLab

T
tangled
Commit 15063712 authored by eroman's avatar eroman Committed by Commit bot
Browse files
Options

Remove unnecessary ScopedTrackers from ProxyScript code. 

BUG=455942

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

Cr-Commit-Position: refs/heads/master@{#327406}
parent 5fa3e0f6
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 59 deletions
net/proxy/proxy_script_decider.cc
View file @ 15063712
...@@ -10,7 +10,6 @@ ...@@ -10,7 +10,6 @@
#include "base/format_macros.h" #include "base/format_macros.h"
#include "base/logging.h" #include "base/logging.h"
#include "base/metrics/histogram.h" #include "base/metrics/histogram.h"
#include "base/profiler/scoped_tracker.h"
#include "base/strings/string_util.h" #include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h" #include "base/strings/utf_string_conversions.h"
#include "base/values.h" #include "base/values.h"
...@@ -104,10 +103,6 @@ ProxyScriptDecider::~ProxyScriptDecider() { ...@@ -104,10 +103,6 @@ ProxyScriptDecider::~ProxyScriptDecider() {
int ProxyScriptDecider::Start( int ProxyScriptDecider::Start(
const ProxyConfig& config, const base::TimeDelta wait_delay, const ProxyConfig& config, const base::TimeDelta wait_delay,
bool fetch_pac_bytes, const CompletionCallback& callback) { bool fetch_pac_bytes, const CompletionCallback& callback) {
// TODO(eroman): Remove ScopedTracker below once crbug.com/455942 is fixed.
tracked_objects::ScopedTracker tracking_profile(
FROM_HERE_WITH_EXPLICIT_FUNCTION("455942 ProxyScriptDecider::Start"));
DCHECK_EQ(STATE_NONE, next_state_); DCHECK_EQ(STATE_NONE, next_state_);
DCHECK(!callback.is_null()); DCHECK(!callback.is_null());
DCHECK(config.HasAutomaticSettings()); DCHECK(config.HasAutomaticSettings());
...@@ -226,10 +221,6 @@ void ProxyScriptDecider::DoCallback(int result) { ...@@ -226,10 +221,6 @@ void ProxyScriptDecider::DoCallback(int result) {
} }
int ProxyScriptDecider::DoWait() { int ProxyScriptDecider::DoWait() {
// TODO(eroman): Remove ScopedTracker below once crbug.com/455942 is fixed.
tracked_objects::ScopedTracker tracking_profile(
FROM_HERE_WITH_EXPLICIT_FUNCTION("455942 ProxyScriptDecider::DoWait"));
next_state_ = STATE_WAIT_COMPLETE; next_state_ = STATE_WAIT_COMPLETE;
// If no waiting is required, continue on to the next state. // If no waiting is required, continue on to the next state.
...@@ -244,11 +235,6 @@ int ProxyScriptDecider::DoWait() { ...@@ -244,11 +235,6 @@ int ProxyScriptDecider::DoWait() {
} }
int ProxyScriptDecider::DoWaitComplete(int result) { int ProxyScriptDecider::DoWaitComplete(int result) {
// TODO(eroman): Remove ScopedTracker below once crbug.com/455942 is fixed.
tracked_objects::ScopedTracker tracking_profile(
FROM_HERE_WITH_EXPLICIT_FUNCTION(
"455942 ProxyScriptDecider::DoWaitComplete"));
DCHECK_EQ(OK, result); DCHECK_EQ(OK, result);
if (wait_delay_.ToInternalValue() != 0) { if (wait_delay_.ToInternalValue() != 0) {
net_log_.EndEventWithNetErrorCode(NetLog::TYPE_PROXY_SCRIPT_DECIDER_WAIT, net_log_.EndEventWithNetErrorCode(NetLog::TYPE_PROXY_SCRIPT_DECIDER_WAIT,
...@@ -262,11 +248,6 @@ int ProxyScriptDecider::DoWaitComplete(int result) { ...@@ -262,11 +248,6 @@ int ProxyScriptDecider::DoWaitComplete(int result) {
} }
int ProxyScriptDecider::DoQuickCheck() { int ProxyScriptDecider::DoQuickCheck() {
// TODO(eroman): Remove ScopedTracker below once crbug.com/455942 is fixed.
tracked_objects::ScopedTracker tracking_profile(
FROM_HERE_WITH_EXPLICIT_FUNCTION(
"455942 ProxyScriptDecider::DoQuickCheck"));
DCHECK(quick_check_enabled_); DCHECK(quick_check_enabled_);
if (host_resolver_.get() == NULL) { if (host_resolver_.get() == NULL) {
// If we have no resolver, skip QuickCheck altogether. // If we have no resolver, skip QuickCheck altogether.
...@@ -294,11 +275,6 @@ int ProxyScriptDecider::DoQuickCheck() { ...@@ -294,11 +275,6 @@ int ProxyScriptDecider::DoQuickCheck() {
} }
int ProxyScriptDecider::DoQuickCheckComplete(int result) { int ProxyScriptDecider::DoQuickCheckComplete(int result) {
// TODO(eroman): Remove ScopedTracker below once crbug.com/455942 is fixed.
tracked_objects::ScopedTracker tracking_profile(
FROM_HERE_WITH_EXPLICIT_FUNCTION(
"455942 ProxyScriptDecider::DoQuickCheckComplete"));
DCHECK(quick_check_enabled_); DCHECK(quick_check_enabled_);
base::TimeDelta delta = base::Time::Now() - quick_check_start_time_; base::TimeDelta delta = base::Time::Now() - quick_check_start_time_;
if (result == OK) if (result == OK)
...@@ -314,11 +290,6 @@ int ProxyScriptDecider::DoQuickCheckComplete(int result) { ...@@ -314,11 +290,6 @@ int ProxyScriptDecider::DoQuickCheckComplete(int result) {
} }
int ProxyScriptDecider::DoFetchPacScript() { int ProxyScriptDecider::DoFetchPacScript() {
// TODO(eroman): Remove ScopedTracker below once crbug.com/455942 is fixed.
tracked_objects::ScopedTracker tracking_profile(
FROM_HERE_WITH_EXPLICIT_FUNCTION(
"455942 ProxyScriptDecider::DoFetchPacScript"));
DCHECK(fetch_pac_bytes_); DCHECK(fetch_pac_bytes_);
next_state_ = STATE_FETCH_PAC_SCRIPT_COMPLETE; next_state_ = STATE_FETCH_PAC_SCRIPT_COMPLETE;
...@@ -367,11 +338,6 @@ int ProxyScriptDecider::DoFetchPacScriptComplete(int result) { ...@@ -367,11 +338,6 @@ int ProxyScriptDecider::DoFetchPacScriptComplete(int result) {
} }
int ProxyScriptDecider::DoVerifyPacScript() { int ProxyScriptDecider::DoVerifyPacScript() {
// TODO(eroman): Remove ScopedTracker below once crbug.com/455942 is fixed.
tracked_objects::ScopedTracker tracking_profile(
FROM_HERE_WITH_EXPLICIT_FUNCTION(
"455942 ProxyScriptDecider::DoVerifyPacScript"));
next_state_ = STATE_VERIFY_PAC_SCRIPT_COMPLETE; next_state_ = STATE_VERIFY_PAC_SCRIPT_COMPLETE;
// This is just a heuristic. Ideally we would try to parse the script. // This is just a heuristic. Ideally we would try to parse the script.
...@@ -382,11 +348,6 @@ int ProxyScriptDecider::DoVerifyPacScript() { ...@@ -382,11 +348,6 @@ int ProxyScriptDecider::DoVerifyPacScript() {
} }
int ProxyScriptDecider::DoVerifyPacScriptComplete(int result) { int ProxyScriptDecider::DoVerifyPacScriptComplete(int result) {
// TODO(eroman): Remove ScopedTracker below once crbug.com/455942 is fixed.
tracked_objects::ScopedTracker tracking_profile(
FROM_HERE_WITH_EXPLICIT_FUNCTION(
"455942 ProxyScriptDecider::DoVerifyPacScriptComplete"));
if (result != OK) if (result != OK)
return TryToFallbackPacSource(result); return TryToFallbackPacSource(result);
......
net/proxy/proxy_script_fetcher_impl.cc
View file @ 15063712
...@@ -7,7 +7,6 @@ ...@@ -7,7 +7,6 @@
#include "base/compiler_specific.h" #include "base/compiler_specific.h"
#include "base/logging.h" #include "base/logging.h"
#include "base/message_loop/message_loop.h" #include "base/message_loop/message_loop.h"
#include "base/profiler/scoped_tracker.h"
#include "base/strings/string_util.h" #include "base/strings/string_util.h"
#include "net/base/data_url.h" #include "net/base/data_url.h"
#include "net/base/io_buffer.h" #include "net/base/io_buffer.h"
...@@ -115,11 +114,6 @@ void ProxyScriptFetcherImpl::OnResponseCompleted(URLRequest* request) { ...@@ -115,11 +114,6 @@ void ProxyScriptFetcherImpl::OnResponseCompleted(URLRequest* request) {
int ProxyScriptFetcherImpl::Fetch( int ProxyScriptFetcherImpl::Fetch(
const GURL& url, base::string16* text, const CompletionCallback& callback) { const GURL& url, base::string16* text, const CompletionCallback& callback) {
// TODO(eroman): Remove ScopedTracker below once crbug.com/455942 is fixed.
tracked_objects::ScopedTracker tracking_profile1(
FROM_HERE_WITH_EXPLICIT_FUNCTION(
"455942 ProxyScriptFetcherImpl::Fetch (Other)"));
// It is invalid to call Fetch() while a request is already in progress. // It is invalid to call Fetch() while a request is already in progress.
DCHECK(!cur_request_.get()); DCHECK(!cur_request_.get());
DCHECK(!callback.is_null()); DCHECK(!callback.is_null());
...@@ -127,10 +121,6 @@ int ProxyScriptFetcherImpl::Fetch( ...@@ -127,10 +121,6 @@ int ProxyScriptFetcherImpl::Fetch(
// Handle base-64 encoded data-urls that contain custom PAC scripts. // Handle base-64 encoded data-urls that contain custom PAC scripts.
if (url.SchemeIs("data")) { if (url.SchemeIs("data")) {
// TODO(eroman): Remove ScopedTracker below once crbug.com/455942 is fixed.
tracked_objects::ScopedTracker tracking_profile2(
FROM_HERE_WITH_EXPLICIT_FUNCTION(
"455942 ProxyScriptFetcherImpl::Fetch (data url)"));
std::string mime_type; std::string mime_type;
std::string charset; std::string charset;
std::string data; std::string data;
...@@ -166,11 +156,6 @@ int ProxyScriptFetcherImpl::Fetch( ...@@ -166,11 +156,6 @@ int ProxyScriptFetcherImpl::Fetch(
// Post a task to timeout this request if it takes too long. // Post a task to timeout this request if it takes too long.
cur_request_id_ = ++next_id_; cur_request_id_ = ++next_id_;
// TODO(eroman): Remove ScopedTracker below once crbug.com/455942 is fixed.
tracked_objects::ScopedTracker tracking_profile3(
FROM_HERE_WITH_EXPLICIT_FUNCTION(
"455942 ProxyScriptFetcherImpl::Fetch (PostDelayedTask)"));
base::MessageLoop::current()->PostDelayedTask( base::MessageLoop::current()->PostDelayedTask(
FROM_HERE, FROM_HERE,
base::Bind(&ProxyScriptFetcherImpl::OnTimeout, base::Bind(&ProxyScriptFetcherImpl::OnTimeout,
......
net/proxy/proxy_service.cc
View file @ 15063712
...@@ -13,7 +13,6 @@ ...@@ -13,7 +13,6 @@
#include "base/memory/weak_ptr.h" #include "base/memory/weak_ptr.h"
#include "base/message_loop/message_loop.h" #include "base/message_loop/message_loop.h"
#include "base/message_loop/message_loop_proxy.h" #include "base/message_loop/message_loop_proxy.h"
#include "base/profiler/scoped_tracker.h"
#include "base/strings/string_util.h" #include "base/strings/string_util.h"
#include "base/thread_task_runner_handle.h" #include "base/thread_task_runner_handle.h"
#include "base/values.h" #include "base/values.h"
...@@ -507,10 +506,6 @@ class ProxyService::InitProxyResolver { ...@@ -507,10 +506,6 @@ class ProxyService::InitProxyResolver {
} }
int DoDecideProxyScript() { int DoDecideProxyScript() {
// TODO(eroman): Remove ScopedTracker below once crbug.com/455942 is fixed.
tracked_objects::ScopedTracker tracking_profile(
FROM_HERE_WITH_EXPLICIT_FUNCTION(
"455942 ProxyService::InitProxyResolver::DoDecideProxyScript"));
next_state_ = STATE_DECIDE_PROXY_SCRIPT_COMPLETE; next_state_ = STATE_DECIDE_PROXY_SCRIPT_COMPLETE;
return decider_->Start( return decider_->Start(
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment