| Index: chrome/browser/net/chrome_network_delegate.cc
|
| diff --git a/chrome/browser/net/chrome_network_delegate.cc b/chrome/browser/net/chrome_network_delegate.cc
|
| index fa9ba6d35deb4ef81011674c72454785d22cbf36..44c7f6b563aaec2584dbcbeb64c0d5e53bcc0d3d 100644
|
| --- a/chrome/browser/net/chrome_network_delegate.cc
|
| +++ b/chrome/browser/net/chrome_network_delegate.cc
|
| @@ -9,6 +9,7 @@
|
|
|
| #include <vector>
|
|
|
| +#include "base/trace_event/trace_event.h"
|
| #include "base/base_paths.h"
|
| #include "base/command_line.h"
|
| #include "base/debug/alias.h"
|
| @@ -377,11 +378,13 @@ int ChromeNetworkDelegate::OnBeforeURLRequest(
|
| net::URLRequest* request,
|
| const net::CompletionCallback& callback,
|
| GURL* new_url) {
|
| + TRACE_EVENT0("toplevel", "ChromeNetworkDelegate::OnBeforeURLRequest");
|
| +
|
| // TODO(mmenke): Remove ScopedTracker below once crbug.com/456327 is fixed.
|
| tracked_objects::ScopedTracker tracking_profile1(
|
| FROM_HERE_WITH_EXPLICIT_FUNCTION(
|
| "456327 URLRequest::ChromeNetworkDelegate::OnBeforeURLRequest"));
|
| -
|
| + TRACE_EVENT0("toplevel", "ChromeNetworkDelegate::OnBeforeURLRequest::A");
|
| #if defined(ENABLE_CONFIGURATION_POLICY)
|
| // TODO(joaodasilva): This prevents extensions from seeing URLs that are
|
| // blocked. However, an extension might redirect the request to another URL,
|
| @@ -401,14 +404,14 @@ int ChromeNetworkDelegate::OnBeforeURLRequest(
|
| return error;
|
| }
|
| #endif
|
| -
|
| + TRACE_EVENT0("toplevel", "ChromeNetworkDelegate::OnBeforeURLRequest::A.1");
|
| // TODO(mmenke): Remove ScopedTracker below once crbug.com/456327 is fixed.
|
| tracked_objects::ScopedTracker tracking_profile2(
|
| FROM_HERE_WITH_EXPLICIT_FUNCTION(
|
| "456327 URLRequest::ChromeNetworkDelegate::OnBeforeURLRequest 2"));
|
|
|
| extensions_delegate_->ForwardStartRequestStatus(request);
|
| -
|
| + TRACE_EVENT0("toplevel", "ChromeNetworkDelegate::OnBeforeURLRequest::B");
|
| if (!enable_referrers_->GetValue())
|
| request->SetReferrer(std::string());
|
| if (enable_do_not_track_ && enable_do_not_track_->GetValue())
|
| @@ -429,10 +432,10 @@ int ChromeNetworkDelegate::OnBeforeURLRequest(
|
| base::Unretained(request),
|
| base::Unretained(new_url));
|
| }
|
| -
|
| + TRACE_EVENT0("toplevel", "ChromeNetworkDelegate::OnBeforeURLRequest::C");
|
| int rv = extensions_delegate_->OnBeforeURLRequest(
|
| request, wrapped_callback, new_url);
|
| -
|
| + TRACE_EVENT0("toplevel", "ChromeNetworkDelegate::OnBeforeURLRequest::C.1");
|
| // TODO(mmenke): Remove ScopedTracker below once crbug.com/456327 is fixed.
|
| tracked_objects::ScopedTracker tracking_profile4(
|
| FROM_HERE_WITH_EXPLICIT_FUNCTION(
|
| @@ -440,7 +443,7 @@ int ChromeNetworkDelegate::OnBeforeURLRequest(
|
|
|
| if (force_safe_search && rv == net::OK && new_url->is_empty())
|
| safe_search_util::ForceGoogleSafeSearch(request, new_url);
|
| -
|
| + TRACE_EVENT0("toplevel", "ChromeNetworkDelegate::OnBeforeURLRequest::C.2");
|
| // TODO(mmenke): Remove ScopedTracker below once crbug.com/456327 is fixed.
|
| tracked_objects::ScopedTracker tracking_profile5(
|
| FROM_HERE_WITH_EXPLICIT_FUNCTION(
|
| @@ -448,7 +451,7 @@ int ChromeNetworkDelegate::OnBeforeURLRequest(
|
|
|
| if (connect_interceptor_)
|
| connect_interceptor_->WitnessURLRequest(request);
|
| -
|
| + TRACE_EVENT0("toplevel", "ChromeNetworkDelegate::OnBeforeURLRequest::C.3");
|
| return rv;
|
| }
|
|
|
| @@ -515,6 +518,7 @@ void ChromeNetworkDelegate::OnNetworkBytesSent(net::URLRequest* request,
|
|
|
| void ChromeNetworkDelegate::OnCompleted(net::URLRequest* request,
|
| bool started) {
|
| + TRACE_EVENT0("toplevel", "ChromeNetworkDelegate::OnCompleted");
|
| // TODO(amohammadkhan): Verify that there is no double recording in data use
|
| // of redirected requests.
|
| data_use_measurement_.ReportDataUseUMA(request);
|
| @@ -579,6 +583,7 @@ ChromeNetworkDelegate::OnAuthRequired(
|
| bool ChromeNetworkDelegate::OnCanGetCookies(
|
| const net::URLRequest& request,
|
| const net::CookieList& cookie_list) {
|
| + TRACE_EVENT0("toplevel", "ChromeNetworkDelegate::OnCanGetCookies");
|
| // NULL during tests, or when we're running in the system context.
|
| if (!cookie_settings_.get())
|
| return true;
|
|
|