| Index: chrome/browser/prerender/prerender_browsertest.cc
|
| diff --git a/chrome/browser/prerender/prerender_browsertest.cc b/chrome/browser/prerender/prerender_browsertest.cc
|
| index 0aa25da296110cf3fecf5a1c1573bcab29654a2a..4990f3b77fb752a009bbb2fa4a3ea2cc0ab9dd39 100644
|
| --- a/chrome/browser/prerender/prerender_browsertest.cc
|
| +++ b/chrome/browser/prerender/prerender_browsertest.cc
|
| @@ -808,7 +808,7 @@ class HangingFirstRequestInterceptor : public net::URLRequestInterceptor {
|
|
|
| net::URLRequestJob* MaybeInterceptRequest(
|
| net::URLRequest* request,
|
| - net::NetworkDelegate* network_delegate) const override {
|
| + net::NetworkDelegate* network_delegate) override {
|
| if (first_run_) {
|
| first_run_ = false;
|
| if (!callback_.is_null()) {
|
| @@ -825,6 +825,19 @@ class HangingFirstRequestInterceptor : public net::URLRequestInterceptor {
|
| base::SequencedWorkerPool::SKIP_ON_SHUTDOWN));
|
| }
|
|
|
| + net::URLRequestJob* MaybeInterceptRedirect(
|
| + net::URLRequest* request,
|
| + net::NetworkDelegate* network_delegate,
|
| + const GURL& location) override {
|
| + return NULL;
|
| + }
|
| +
|
| + net::URLRequestJob* MaybeInterceptResponse(
|
| + net::URLRequest* request,
|
| + net::NetworkDelegate* network_delegate) override {
|
| + return NULL;
|
| + }
|
| +
|
| private:
|
| base::FilePath file_;
|
| base::Closure callback_;
|
| @@ -916,13 +929,26 @@ class CountingInterceptor : public net::URLRequestInterceptor {
|
|
|
| net::URLRequestJob* MaybeInterceptRequest(
|
| net::URLRequest* request,
|
| - net::NetworkDelegate* network_delegate) const override {
|
| + net::NetworkDelegate* network_delegate) override {
|
| MockHTTPJob* job = new MockHTTPJob(request, network_delegate, file_);
|
| job->set_start_callback(base::Bind(&CountingInterceptor::RequestStarted,
|
| weak_factory_.GetWeakPtr()));
|
| return job;
|
| }
|
|
|
| + net::URLRequestJob* MaybeInterceptRedirect(
|
| + net::URLRequest* request,
|
| + net::NetworkDelegate* network_delegate,
|
| + const GURL& location) override {
|
| + return NULL;
|
| + }
|
| +
|
| + net::URLRequestJob* MaybeInterceptResponse(
|
| + net::URLRequest* request,
|
| + net::NetworkDelegate* network_delegate) override {
|
| + return NULL;
|
| + }
|
| +
|
| void RequestStarted() {
|
| BrowserThread::PostTask(
|
| BrowserThread::UI, FROM_HERE,
|
|
|