Index: net/url_request/url_request_throttler_entry.cc |
diff --git a/net/url_request/url_request_throttler_entry.cc b/net/url_request/url_request_throttler_entry.cc |
index fdaaf7ff0d89f9a612521e4ab61f7cf6bc589242..308ddc27ab5b85221c618cad968912f870077a4e 100644 |
--- a/net/url_request/url_request_throttler_entry.cc |
+++ b/net/url_request/url_request_throttler_entry.cc |
@@ -52,7 +52,7 @@ const char URLRequestThrottlerEntry::kExponentialThrottlingDisableValue[] = |
"disable"; |
// Returns NetLog parameters when a request is rejected by throttling. |
-base::Value* NetLogRejectedRequestCallback( |
+scoped_ptr<base::Value> NetLogRejectedRequestCallback( |
const std::string* url_id, |
int num_failures, |
const base::TimeDelta& release_after, |
@@ -62,7 +62,7 @@ base::Value* NetLogRejectedRequestCallback( |
dict->SetInteger("num_failures", num_failures); |
dict->SetInteger("release_after_ms", |
static_cast<int>(release_after.InMilliseconds())); |
- return dict.release(); |
+ return dict.Pass(); |
} |
URLRequestThrottlerEntry::URLRequestThrottlerEntry( |
@@ -158,12 +158,10 @@ bool URLRequestThrottlerEntry::ShouldRejectRequest( |
if (!is_backoff_disabled_ && !ExplicitUserRequest(request.load_flags()) && |
(!network_delegate || network_delegate->CanThrottleRequest(request)) && |
GetBackoffEntry()->ShouldRejectRequest()) { |
- net_log_.AddEvent( |
- NetLog::TYPE_THROTTLING_REJECTED_REQUEST, |
- base::Bind(&NetLogRejectedRequestCallback, |
- &url_id_, |
- GetBackoffEntry()->failure_count(), |
- GetBackoffEntry()->GetTimeUntilRelease())); |
+ net_log_.AddEvent(NetLog::TYPE_THROTTLING_REJECTED_REQUEST, |
+ base::Bind(NetLogRejectedRequestCallback, &url_id_, |
+ GetBackoffEntry()->failure_count(), |
+ GetBackoffEntry()->GetTimeUntilRelease())); |
reject_request = true; |
} |