OLD | NEW |
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" |
11 #include "base/json/json_writer.h" | 12 #include "base/json/json_writer.h" |
12 #include "base/lazy_instance.h" | 13 #include "base/lazy_instance.h" |
13 #include "base/macros.h" | 14 #include "base/macros.h" |
14 #include "base/metrics/histogram.h" | 15 #include "base/metrics/histogram.h" |
15 #include "base/strings/string_number_conversions.h" | 16 #include "base/strings/string_number_conversions.h" |
16 #include "base/strings/string_util.h" | 17 #include "base/strings/string_util.h" |
17 #include "base/strings/utf_string_conversions.h" | 18 #include "base/strings/utf_string_conversions.h" |
18 #include "base/time/time.h" | 19 #include "base/time/time.h" |
19 #include "base/values.h" | 20 #include "base/values.h" |
20 #include "content/public/browser/browser_message_filter.h" | 21 #include "content/public/browser/browser_message_filter.h" |
(...skipping 1198 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1219 void* browser_context, | 1220 void* browser_context, |
1220 const net::URLRequest* request) { | 1221 const net::URLRequest* request) { |
1221 ClearPendingCallbacks(request); | 1222 ClearPendingCallbacks(request); |
1222 | 1223 |
1223 signaled_requests_.erase(request->identifier()); | 1224 signaled_requests_.erase(request->identifier()); |
1224 | 1225 |
1225 request_time_tracker_->LogRequestEndTime(request->identifier(), | 1226 request_time_tracker_->LogRequestEndTime(request->identifier(), |
1226 base::Time::Now()); | 1227 base::Time::Now()); |
1227 } | 1228 } |
1228 | 1229 |
| 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 |
1229 void ExtensionWebRequestEventRouter::ClearPendingCallbacks( | 1244 void ExtensionWebRequestEventRouter::ClearPendingCallbacks( |
1230 const net::URLRequest* request) { | 1245 const net::URLRequest* request) { |
1231 blocked_requests_.erase(request->identifier()); | 1246 blocked_requests_.erase(request->identifier()); |
1232 } | 1247 } |
1233 | 1248 |
1234 bool ExtensionWebRequestEventRouter::DispatchEvent( | 1249 bool ExtensionWebRequestEventRouter::DispatchEvent( |
1235 void* browser_context, | 1250 void* browser_context, |
1236 net::URLRequest* request, | 1251 net::URLRequest* request, |
1237 const std::vector<const EventListener*>& listeners, | 1252 const std::vector<const EventListener*>& listeners, |
1238 const base::ListValue& args) { | 1253 const base::ListValue& args) { |
(...skipping 1243 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2482 // Continue gracefully. | 2497 // Continue gracefully. |
2483 RunSync(); | 2498 RunSync(); |
2484 } | 2499 } |
2485 | 2500 |
2486 bool WebRequestHandlerBehaviorChangedFunction::RunSync() { | 2501 bool WebRequestHandlerBehaviorChangedFunction::RunSync() { |
2487 helpers::ClearCacheOnNavigation(); | 2502 helpers::ClearCacheOnNavigation(); |
2488 return true; | 2503 return true; |
2489 } | 2504 } |
2490 | 2505 |
2491 } // namespace extensions | 2506 } // namespace extensions |
OLD | NEW |