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

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

Issue 1465503002: Revert of CHECK that URLRequestJobs are not orphaned while blocked by extensions. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Make git do the revert Created 5 years, 1 month 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
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
(...skipping 541 matching lines...) Expand 10 before | Expand all | Expand 10 after
552 domain_reliability_monitor_->OnCompleted(request, started); 552 domain_reliability_monitor_->OnCompleted(request, started);
553 RecordRequestSourceBandwidth(request, started); 553 RecordRequestSourceBandwidth(request, started);
554 extensions_delegate_->ForwardProxyErrors(request); 554 extensions_delegate_->ForwardProxyErrors(request);
555 extensions_delegate_->ForwardDoneRequestStatus(request); 555 extensions_delegate_->ForwardDoneRequestStatus(request);
556 } 556 }
557 557
558 void ChromeNetworkDelegate::OnURLRequestDestroyed(net::URLRequest* request) { 558 void ChromeNetworkDelegate::OnURLRequestDestroyed(net::URLRequest* request) {
559 extensions_delegate_->OnURLRequestDestroyed(request); 559 extensions_delegate_->OnURLRequestDestroyed(request);
560 } 560 }
561 561
562 void ChromeNetworkDelegate::OnURLRequestJobOrphaned(net::URLRequest* request) {
563 extensions_delegate_->OnURLRequestJobOrphaned(request);
564 }
565
566 void ChromeNetworkDelegate::OnPACScriptError(int line_number, 562 void ChromeNetworkDelegate::OnPACScriptError(int line_number,
567 const base::string16& error) { 563 const base::string16& error) {
568 extensions_delegate_->OnPACScriptError(line_number, error); 564 extensions_delegate_->OnPACScriptError(line_number, error);
569 } 565 }
570 566
571 net::NetworkDelegate::AuthRequiredResponse 567 net::NetworkDelegate::AuthRequiredResponse
572 ChromeNetworkDelegate::OnAuthRequired( 568 ChromeNetworkDelegate::OnAuthRequired(
573 net::URLRequest* request, 569 net::URLRequest* request,
574 const net::AuthChallengeInfo& auth_info, 570 const net::AuthChallengeInfo& auth_info,
575 const AuthCallback& callback, 571 const AuthCallback& callback,
(...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after
742 if (!data_use_aggregator_) 738 if (!data_use_aggregator_)
743 return; 739 return;
744 740
745 if (is_data_usage_off_the_record_) { 741 if (is_data_usage_off_the_record_) {
746 data_use_aggregator_->ReportOffTheRecordDataUse(tx_bytes, rx_bytes); 742 data_use_aggregator_->ReportOffTheRecordDataUse(tx_bytes, rx_bytes);
747 return; 743 return;
748 } 744 }
749 745
750 data_use_aggregator_->ReportDataUse(request, tx_bytes, rx_bytes); 746 data_use_aggregator_->ReportDataUse(request, tx_bytes, rx_bytes);
751 } 747 }
OLDNEW
« no previous file with comments | « chrome/browser/net/chrome_network_delegate.h ('k') | extensions/browser/api/web_request/web_request_api.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698