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

Side by Side Diff: chrome/browser/net/chrome_network_delegate.cc

Issue 931343002: Remove net URLRequest trace events. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 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 unified diff | Download patch
« no previous file with comments | « no previous file | content/browser/loader/resource_scheduler.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/net/chrome_network_delegate.h" 5 #include "chrome/browser/net/chrome_network_delegate.h"
6 6
7 #include <stdlib.h> 7 #include <stdlib.h>
8 8
9 #include <vector> 9 #include <vector>
10 10
11 #include "base/base_paths.h" 11 #include "base/base_paths.h"
12 #include "base/debug/alias.h" 12 #include "base/debug/alias.h"
13 #include "base/debug/dump_without_crashing.h" 13 #include "base/debug/dump_without_crashing.h"
14 #include "base/debug/stack_trace.h" 14 #include "base/debug/stack_trace.h"
15 #include "base/logging.h" 15 #include "base/logging.h"
16 #include "base/metrics/histogram.h" 16 #include "base/metrics/histogram.h"
17 #include "base/metrics/sparse_histogram.h" 17 #include "base/metrics/sparse_histogram.h"
18 #include "base/metrics/user_metrics.h" 18 #include "base/metrics/user_metrics.h"
19 #include "base/path_service.h" 19 #include "base/path_service.h"
20 #include "base/prefs/pref_member.h" 20 #include "base/prefs/pref_member.h"
21 #include "base/prefs/pref_service.h" 21 #include "base/prefs/pref_service.h"
22 #include "base/profiler/scoped_tracker.h" 22 #include "base/profiler/scoped_tracker.h"
23 #include "base/strings/string_number_conversions.h" 23 #include "base/strings/string_number_conversions.h"
24 #include "base/time/time.h" 24 #include "base/time/time.h"
25 #include "base/trace_event/trace_event.h" 25 #include "base/trace_event/trace_event.h"
mmenke 2015/02/18 20:41:26 Is this still needed? (Hrm...doesn't look like th
xunjieli 2015/02/18 21:23:29 Done.
26 #include "chrome/browser/browser_process.h" 26 #include "chrome/browser/browser_process.h"
27 #include "chrome/browser/content_settings/cookie_settings.h" 27 #include "chrome/browser/content_settings/cookie_settings.h"
28 #include "chrome/browser/content_settings/tab_specific_content_settings.h" 28 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
29 #include "chrome/browser/custom_handlers/protocol_handler_registry.h" 29 #include "chrome/browser/custom_handlers/protocol_handler_registry.h"
30 #include "chrome/browser/net/chrome_extensions_network_delegate.h" 30 #include "chrome/browser/net/chrome_extensions_network_delegate.h"
31 #include "chrome/browser/net/client_hints.h" 31 #include "chrome/browser/net/client_hints.h"
32 #include "chrome/browser/net/connect_interceptor.h" 32 #include "chrome/browser/net/connect_interceptor.h"
33 #include "chrome/browser/net/safe_search_util.h" 33 #include "chrome/browser/net/safe_search_util.h"
34 #include "chrome/browser/prerender/prerender_tracker.h" 34 #include "chrome/browser/prerender/prerender_tracker.h"
35 #include "chrome/browser/profiles/profile_manager.h" 35 #include "chrome/browser/profiles/profile_manager.h"
(...skipping 283 matching lines...) Expand 10 before | Expand all | Expand 10 after
319 int ChromeNetworkDelegate::OnBeforeSendHeaders( 319 int ChromeNetworkDelegate::OnBeforeSendHeaders(
320 net::URLRequest* request, 320 net::URLRequest* request,
321 const net::CompletionCallback& callback, 321 const net::CompletionCallback& callback,
322 net::HttpRequestHeaders* headers) { 322 net::HttpRequestHeaders* headers) {
323 bool force_safety_mode = 323 bool force_safety_mode =
324 (force_safe_search_ && force_safe_search_->GetValue()) || 324 (force_safe_search_ && force_safe_search_->GetValue()) ||
325 (force_youtube_safety_mode_ && force_youtube_safety_mode_->GetValue()); 325 (force_youtube_safety_mode_ && force_youtube_safety_mode_->GetValue());
326 if (force_safety_mode) 326 if (force_safety_mode)
327 safe_search_util::ForceYouTubeSafetyMode(request, headers); 327 safe_search_util::ForceYouTubeSafetyMode(request, headers);
328 328
329 TRACE_EVENT_ASYNC_STEP_PAST0("net", "URLRequest", request, "SendRequest");
330 return extensions_delegate_->OnBeforeSendHeaders(request, callback, headers); 329 return extensions_delegate_->OnBeforeSendHeaders(request, callback, headers);
331 } 330 }
332 331
333 void ChromeNetworkDelegate::OnSendHeaders( 332 void ChromeNetworkDelegate::OnSendHeaders(
334 net::URLRequest* request, 333 net::URLRequest* request,
335 const net::HttpRequestHeaders& headers) { 334 const net::HttpRequestHeaders& headers) {
336 extensions_delegate_->OnSendHeaders(request, headers); 335 extensions_delegate_->OnSendHeaders(request, headers);
337 } 336 }
338 337
339 int ChromeNetworkDelegate::OnHeadersReceived( 338 int ChromeNetworkDelegate::OnHeadersReceived(
(...skipping 12 matching lines...) Expand all
352 351
353 void ChromeNetworkDelegate::OnBeforeRedirect(net::URLRequest* request, 352 void ChromeNetworkDelegate::OnBeforeRedirect(net::URLRequest* request,
354 const GURL& new_location) { 353 const GURL& new_location) {
355 if (domain_reliability_monitor_) 354 if (domain_reliability_monitor_)
356 domain_reliability_monitor_->OnBeforeRedirect(request); 355 domain_reliability_monitor_->OnBeforeRedirect(request);
357 extensions_delegate_->OnBeforeRedirect(request, new_location); 356 extensions_delegate_->OnBeforeRedirect(request, new_location);
358 } 357 }
359 358
360 359
361 void ChromeNetworkDelegate::OnResponseStarted(net::URLRequest* request) { 360 void ChromeNetworkDelegate::OnResponseStarted(net::URLRequest* request) {
362 TRACE_EVENT_ASYNC_STEP_PAST0("net", "URLRequest", request, "ResponseStarted");
363 extensions_delegate_->OnResponseStarted(request); 361 extensions_delegate_->OnResponseStarted(request);
364 } 362 }
365 363
366 void ChromeNetworkDelegate::OnRawBytesRead(const net::URLRequest& request, 364 void ChromeNetworkDelegate::OnRawBytesRead(const net::URLRequest& request,
367 int bytes_read) { 365 int bytes_read) {
368 // TODO(vadimt): Remove ScopedTracker below once crbug.com/423948 is fixed. 366 // TODO(vadimt): Remove ScopedTracker below once crbug.com/423948 is fixed.
369 tracked_objects::ScopedTracker tracking_profile( 367 tracked_objects::ScopedTracker tracking_profile(
370 FROM_HERE_WITH_EXPLICIT_FUNCTION( 368 FROM_HERE_WITH_EXPLICIT_FUNCTION(
371 "423948 ChromeNetworkDelegate::OnRawBytesRead")); 369 "423948 ChromeNetworkDelegate::OnRawBytesRead"));
372 370
373 TRACE_EVENT_ASYNC_STEP_PAST1("net", "URLRequest", &request, "DidRead",
374 "bytes_read", bytes_read);
375 #if defined(ENABLE_TASK_MANAGER) 371 #if defined(ENABLE_TASK_MANAGER)
376 // This is not completely accurate, but as a first approximation ignore 372 // This is not completely accurate, but as a first approximation ignore
377 // requests that are served from the cache. See bug 330931 for more info. 373 // requests that are served from the cache. See bug 330931 for more info.
378 if (!request.was_cached()) { 374 if (!request.was_cached()) {
379 // TODO(vadimt): Remove ScopedTracker below once crbug.com/423948 is fixed. 375 // TODO(vadimt): Remove ScopedTracker below once crbug.com/423948 is fixed.
380 // I suspect that the jank is in creating a TaskManager instance. After the 376 // I suspect that the jank is in creating a TaskManager instance. After the
381 // bug is fixed, rewrite the operators below as one line. 377 // bug is fixed, rewrite the operators below as one line.
382 tracked_objects::ScopedTracker tracking_profile1( 378 tracked_objects::ScopedTracker tracking_profile1(
383 FROM_HERE_WITH_EXPLICIT_FUNCTION( 379 FROM_HERE_WITH_EXPLICIT_FUNCTION(
384 "423948 ChromeNetworkDelegate::OnRawBytesRead1")); 380 "423948 ChromeNetworkDelegate::OnRawBytesRead1"));
385 381
386 TaskManager* task_manager = TaskManager::GetInstance(); 382 TaskManager* task_manager = TaskManager::GetInstance();
387 383
388 // TODO(vadimt): Remove ScopedTracker below once crbug.com/423948 is fixed. 384 // TODO(vadimt): Remove ScopedTracker below once crbug.com/423948 is fixed.
389 tracked_objects::ScopedTracker tracking_profile2( 385 tracked_objects::ScopedTracker tracking_profile2(
390 FROM_HERE_WITH_EXPLICIT_FUNCTION( 386 FROM_HERE_WITH_EXPLICIT_FUNCTION(
391 "423948 ChromeNetworkDelegate::OnRawBytesRead2")); 387 "423948 ChromeNetworkDelegate::OnRawBytesRead2"));
392 388
393 task_manager->model()->NotifyBytesRead(request, bytes_read); 389 task_manager->model()->NotifyBytesRead(request, bytes_read);
394 } 390 }
395 #endif // defined(ENABLE_TASK_MANAGER) 391 #endif // defined(ENABLE_TASK_MANAGER)
396 } 392 }
397 393
398 void ChromeNetworkDelegate::OnCompleted(net::URLRequest* request, 394 void ChromeNetworkDelegate::OnCompleted(net::URLRequest* request,
399 bool started) { 395 bool started) {
400 RecordNetworkErrorHistograms(request); 396 RecordNetworkErrorHistograms(request);
401 397
402 TRACE_EVENT_ASYNC_END0("net", "URLRequest", request);
403 if (request->status().status() == net::URLRequestStatus::SUCCESS) { 398 if (request->status().status() == net::URLRequestStatus::SUCCESS) {
404 #if defined(OS_ANDROID) 399 #if defined(OS_ANDROID)
405 // For better accuracy, we use the actual bytes read instead of the length 400 // For better accuracy, we use the actual bytes read instead of the length
406 // specified with the Content-Length header, which may be inaccurate, 401 // specified with the Content-Length header, which may be inaccurate,
407 // or missing, as is the case with chunked encoding. 402 // or missing, as is the case with chunked encoding.
408 int64 received_content_length = request->received_response_content_length(); 403 int64 received_content_length = request->received_response_content_length();
409 404
410 if (precache::PrecacheManager::IsPrecachingEnabled()) { 405 if (precache::PrecacheManager::IsPrecachingEnabled()) {
411 // Record precache metrics when a fetch is completed successfully, if 406 // Record precache metrics when a fetch is completed successfully, if
412 // precaching is enabled. 407 // precaching is enabled.
(...skipping 205 matching lines...) Expand 10 before | Expand all | Expand 10 after
618 return privacy_mode; 613 return privacy_mode;
619 } 614 }
620 615
621 bool ChromeNetworkDelegate::OnCancelURLRequestWithPolicyViolatingReferrerHeader( 616 bool ChromeNetworkDelegate::OnCancelURLRequestWithPolicyViolatingReferrerHeader(
622 const net::URLRequest& request, 617 const net::URLRequest& request,
623 const GURL& target_url, 618 const GURL& target_url,
624 const GURL& referrer_url) const { 619 const GURL& referrer_url) const {
625 ReportInvalidReferrerSend(target_url, referrer_url); 620 ReportInvalidReferrerSend(target_url, referrer_url);
626 return true; 621 return true;
627 } 622 }
OLDNEW
« no previous file with comments | « no previous file | content/browser/loader/resource_scheduler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698