| Index: content/common/net/url_fetcher_core.cc
|
| diff --git a/content/common/net/url_fetcher_core.cc b/content/common/net/url_fetcher_core.cc
|
| index c384146c0c2bda719755f616076a2060d141df58..5ab4311c7ef10dc05542ecf57885bd69c1e38b24 100644
|
| --- a/content/common/net/url_fetcher_core.cc
|
| +++ b/content/common/net/url_fetcher_core.cc
|
| @@ -16,6 +16,7 @@
|
| #include "net/base/load_flags.h"
|
| #include "net/base/net_errors.h"
|
| #include "net/http/http_response_headers.h"
|
| +#include "net/url_request/url_request_context.h"
|
| #include "net/url_request/url_request_context_getter.h"
|
| #include "net/url_request/url_request_throttler_manager.h"
|
|
|
| @@ -602,7 +603,7 @@ void URLFetcherCore::OnReadCompleted(net::URLRequest* request,
|
|
|
| url_ = request->url();
|
| url_throttler_entry_ =
|
| - net::URLRequestThrottlerManager::GetInstance()->RegisterRequestUrl(url_);
|
| + request->context()->throttler_manager()->RegisterRequestUrl(url_);
|
|
|
| bool waiting_on_write = false;
|
| do {
|
| @@ -788,10 +789,12 @@ void URLFetcherCore::StartURLRequestWhenAppropriate() {
|
| if (was_cancelled_)
|
| return;
|
|
|
| + DCHECK(request_context_getter_);
|
| +
|
| if (original_url_throttler_entry_ == NULL) {
|
| original_url_throttler_entry_ =
|
| - net::URLRequestThrottlerManager::GetInstance()->RegisterRequestUrl(
|
| - original_url_);
|
| + request_context_getter_->GetURLRequestContext()->
|
| + throttler_manager()->RegisterRequestUrl(original_url_);
|
| }
|
|
|
| int64 delay = original_url_throttler_entry_->ReserveSendingTimeForNextRequest(
|
|
|