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

Side by Side Diff: extensions/browser/api/web_request/web_request_api.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 "extensions/browser/api/web_request/web_request_api.h" 5 #include "extensions/browser/api/web_request/web_request_api.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/bind_helpers.h" 10 #include "base/bind_helpers.h"
11 #include "base/debug/alias.h"
12 #include "base/json/json_writer.h" 11 #include "base/json/json_writer.h"
13 #include "base/lazy_instance.h" 12 #include "base/lazy_instance.h"
14 #include "base/macros.h" 13 #include "base/macros.h"
15 #include "base/metrics/histogram.h" 14 #include "base/metrics/histogram.h"
16 #include "base/strings/string_number_conversions.h" 15 #include "base/strings/string_number_conversions.h"
17 #include "base/strings/string_util.h" 16 #include "base/strings/string_util.h"
18 #include "base/strings/utf_string_conversions.h" 17 #include "base/strings/utf_string_conversions.h"
19 #include "base/time/time.h" 18 #include "base/time/time.h"
20 #include "base/values.h" 19 #include "base/values.h"
21 #include "content/public/browser/browser_message_filter.h" 20 #include "content/public/browser/browser_message_filter.h"
(...skipping 1198 matching lines...) Expand 10 before | Expand all | Expand 10 after
1220 void* browser_context, 1219 void* browser_context,
1221 const net::URLRequest* request) { 1220 const net::URLRequest* request) {
1222 ClearPendingCallbacks(request); 1221 ClearPendingCallbacks(request);
1223 1222
1224 signaled_requests_.erase(request->identifier()); 1223 signaled_requests_.erase(request->identifier());
1225 1224
1226 request_time_tracker_->LogRequestEndTime(request->identifier(), 1225 request_time_tracker_->LogRequestEndTime(request->identifier(),
1227 base::Time::Now()); 1226 base::Time::Now());
1228 } 1227 }
1229 1228
1230 void ExtensionWebRequestEventRouter::OnURLRequestJobOrphaned(
1231 void* browser_context,
1232 const net::URLRequest* request) {
1233 // See https://crbug.com/289715. While a URLRequest is blocking on an
1234 // extension, it may not orphan jobs unless OnURLRequestDestroyed is called
1235 // first.
1236 //
1237 // TODO(davidben): Remove this when the crash has been diagnosed.
1238 char url_buf[128];
1239 base::strlcpy(url_buf, request->url().spec().c_str(), arraysize(url_buf));
1240 base::debug::Alias(url_buf);
1241 CHECK_EQ(0u, blocked_requests_.count(request->identifier()));
1242 }
1243
1244 void ExtensionWebRequestEventRouter::ClearPendingCallbacks( 1229 void ExtensionWebRequestEventRouter::ClearPendingCallbacks(
1245 const net::URLRequest* request) { 1230 const net::URLRequest* request) {
1246 blocked_requests_.erase(request->identifier()); 1231 blocked_requests_.erase(request->identifier());
1247 } 1232 }
1248 1233
1249 bool ExtensionWebRequestEventRouter::DispatchEvent( 1234 bool ExtensionWebRequestEventRouter::DispatchEvent(
1250 void* browser_context, 1235 void* browser_context,
1251 net::URLRequest* request, 1236 net::URLRequest* request,
1252 const std::vector<const EventListener*>& listeners, 1237 const std::vector<const EventListener*>& listeners,
1253 const base::ListValue& args) { 1238 const base::ListValue& args) {
(...skipping 1243 matching lines...) Expand 10 before | Expand all | Expand 10 after
2497 // Continue gracefully. 2482 // Continue gracefully.
2498 RunSync(); 2483 RunSync();
2499 } 2484 }
2500 2485
2501 bool WebRequestHandlerBehaviorChangedFunction::RunSync() { 2486 bool WebRequestHandlerBehaviorChangedFunction::RunSync() {
2502 helpers::ClearCacheOnNavigation(); 2487 helpers::ClearCacheOnNavigation();
2503 return true; 2488 return true;
2504 } 2489 }
2505 2490
2506 } // namespace extensions 2491 } // namespace extensions
OLDNEW
« no previous file with comments | « extensions/browser/api/web_request/web_request_api.h ('k') | net/base/layered_network_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698