| Index: chrome/browser/errorpage_browsertest.cc
|
| diff --git a/chrome/browser/errorpage_browsertest.cc b/chrome/browser/errorpage_browsertest.cc
|
| index dcab17ddbc01ecf444d1632c7eebe060c6738a0a..e7ebaddb89feca4d2eeab96d40fe32f21ec22de2 100644
|
| --- a/chrome/browser/errorpage_browsertest.cc
|
| +++ b/chrome/browser/errorpage_browsertest.cc
|
| @@ -159,7 +159,7 @@ class FailFirstNRequestsInterceptor : public net::URLRequestInterceptor {
|
| // net::URLRequestInterceptor implementation
|
| net::URLRequestJob* MaybeInterceptRequest(
|
| net::URLRequest* request,
|
| - net::NetworkDelegate* network_delegate) const override {
|
| + net::NetworkDelegate* network_delegate) override {
|
| DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
|
| requests_++;
|
| if (failures_ < requests_to_fail_) {
|
| @@ -177,6 +177,19 @@ class FailFirstNRequestsInterceptor : public net::URLRequestInterceptor {
|
| }
|
| }
|
|
|
| + 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;
|
| + }
|
| +
|
| int requests() const { return requests_; }
|
| int failures() const { return failures_; }
|
|
|
| @@ -205,7 +218,7 @@ class LinkDoctorInterceptor : public net::URLRequestInterceptor {
|
| // net::URLRequestInterceptor implementation
|
| net::URLRequestJob* MaybeInterceptRequest(
|
| net::URLRequest* request,
|
| - net::NetworkDelegate* network_delegate) const override {
|
| + net::NetworkDelegate* network_delegate) override {
|
| DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
|
|
|
| BrowserThread::PostTask(
|
| @@ -223,6 +236,19 @@ class LinkDoctorInterceptor : 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;
|
| + }
|
| +
|
| void WaitForRequests(int requests_to_wait_for) {
|
| DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
|
| DCHECK_EQ(-1, requests_to_wait_for_);
|
| @@ -941,12 +967,25 @@ class AddressUnreachableInterceptor : public net::URLRequestInterceptor {
|
| // net::URLRequestInterceptor:
|
| net::URLRequestJob* MaybeInterceptRequest(
|
| net::URLRequest* request,
|
| - net::NetworkDelegate* network_delegate) const override {
|
| + net::NetworkDelegate* network_delegate) override {
|
| return new URLRequestFailedJob(request,
|
| network_delegate,
|
| net::ERR_ADDRESS_UNREACHABLE);
|
| }
|
|
|
| + net::URLRequestJob* MaybeInterceptResponse(
|
| + net::URLRequest* request,
|
| + net::NetworkDelegate* network_delegate) override {
|
| + return NULL;
|
| + }
|
| +
|
| + net::URLRequestJob* MaybeInterceptRedirect(
|
| + net::URLRequest* request,
|
| + net::NetworkDelegate* network_delegate,
|
| + const GURL& location) override {
|
| + return NULL;
|
| + }
|
| +
|
| private:
|
| DISALLOW_COPY_AND_ASSIGN(AddressUnreachableInterceptor);
|
| };
|
|
|