Move AuthenticatingURLLoader app from ErrorHandler to callbacks

services/authenticating_url_loader_interceptor/authenticating_url_loader_interceptor.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "services/authenticating_url_loader_interceptor/authenticating_url_loader_interceptor.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "mojo/services/network/public/interfaces/network_service.mojom.h"
 
 namespace mojo {
 
 AuthenticatingURLLoaderInterceptor::AuthenticatingURLLoaderInterceptor(
     mojo::InterfaceRequest<URLLoaderInterceptor> request,
     AuthenticatingURLLoaderInterceptorFactory* factory)
     : binding_(this, request.Pass()),
       factory_(factory),
       add_authentication_(true),
       request_authorization_state_(REQUEST_INITIAL) {
-  binding_.set_error_handler(this);
 }
 
 AuthenticatingURLLoaderInterceptor::~AuthenticatingURLLoaderInterceptor() {
 }
 
+void AuthenticatingURLLoaderInterceptor::set_connection_error_handler(
+    const Closure& error_handler) {
+  binding_.set_connection_error_handler(error_handler);
+}
+
 void AuthenticatingURLLoaderInterceptor::InterceptRequest(
     mojo::URLRequestPtr request,
     const InterceptRequestCallback& callback) {
   // TODO(blundell): If we need to handle requests with bodies, we'll need to
   // do something here.
   if (request->body) {
     LOG(ERROR) << "Cannot pass a request to AuthenticatingURLLoaderInterceptor"
                   "that has a body";
     callback.Run(nullptr);
     return;
@@ skipping 113 matching lines @@
     request_authorization_state_ = REQUEST_USED_CURRENT_AUTH_SERVICE_TOKEN;
   } else {
     request_authorization_state_ = REQUEST_USED_FRESH_AUTH_SERVICE_TOKEN;
   }
   factory_->RetrieveToken(
       url_,
       base::Bind(&AuthenticatingURLLoaderInterceptor::OnOAuth2TokenReceived,
                  base::Unretained(this)));
 }
 
-void AuthenticatingURLLoaderInterceptor::OnConnectionError() {
-  factory_->OnInterceptorError(this);
-  // The factory deleted this object.
-}
-
 URLRequestPtr AuthenticatingURLLoaderInterceptor::BuildRequest(
     std::string token) {
   // We should only be sending out a request with a token if the initial
   // request did not come in with an authorization header.
   DCHECK(add_authentication_);
   Array<HttpHeaderPtr> headers;
   if (headers_)
     headers = headers_.Clone();
 
   if (token == "")
@@ skipping 34 matching lines @@
     interceptor_response->response = pending_response_.Pass();
   } else {
     interceptor_response->request = BuildRequest(token);
   }
 
   pending_interception_callback_.Run(interceptor_response.Pass());
   pending_interception_callback_.reset();
 }
 
 }  // namespace mojo