Add HttpProtocolHandler and convert everything to use it

android_webview/browser/net/aw_url_request_job_factory.cc

 // Copyright (c) 2012 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 "android_webview/browser/net/aw_url_request_job_factory.h"
 
 #include <utility>
 
 #include "net/base/net_errors.h"
 #include "net/url_request/url_request_error_job.h"
 #include "net/url_request/url_request_job_factory_impl.h"
 #include "net/url_request/url_request_job_manager.h"
 
 using net::NetworkDelegate;
 using net::URLRequest;
 using net::URLRequestJob;
 
 namespace android_webview {
 
 AwURLRequestJobFactory::AwURLRequestJobFactory()
     : next_factory_(new net::URLRequestJobFactoryImpl()) {
 }
 
 AwURLRequestJobFactory::~AwURLRequestJobFactory() {
 }
 
 bool AwURLRequestJobFactory::IsHandledProtocol(
     const std::string& scheme) const {
-  // This introduces a dependency on the URLRequestJobManager
-  // implementation. The assumption is that if true is returned from this
-  // method it is still valid to return NULL from the
-  // MaybeCreateJobWithProtocolHandler method and in that case the
-  // URLRequestJobManager will try and create the URLRequestJob by using the
-  // set of built in handlers.
   return true;
 }
 
 bool AwURLRequestJobFactory::IsHandledURL(const GURL& url) const {
   return true;
 }
 
 URLRequestJob* AwURLRequestJobFactory::MaybeCreateJobWithProtocolHandler(
     const std::string& scheme,
     URLRequest* request,
     NetworkDelegate* network_delegate) const {
   URLRequestJob* job = next_factory_->MaybeCreateJobWithProtocolHandler(
       scheme, request, network_delegate);
 
   if (job)
     return job;

[mmenke, 2016/04/22 18:37:52]

This will switch some failures from ERR_FAILED to ERR_UNKNOWN_URL_SCHEME, at
least until you move all creation down into URLRequestFactoryImpl.  I don't
think we really care, though.

 
-  // If a URLRequestJobManager built-in factory supports the scheme, NULL should
-  // be returned from this method.
-  // In that case the built in handlers will then be used to create the job.
-  // TODO(mgersh): remove this check once HttpProtocolHandler exists and is
-  // added to the relevant URLRequestJobFactory.
-  // NOTE(joth): See the assumption in IsHandledProtocol above.
-  if (next_factory_->IsHandledProtocol(scheme))
-    return NULL;
-
   return new net::URLRequestErrorJob(
       request, network_delegate, net::ERR_UNKNOWN_URL_SCHEME);
 }
 
 net::URLRequestJob* AwURLRequestJobFactory::MaybeInterceptRedirect(
      net::URLRequest* request,
      net::NetworkDelegate* network_delegate,
      const GURL& location) const  {
    return next_factory_->MaybeInterceptRedirect(
        request, network_delegate, location);
 }
 
 net::URLRequestJob* AwURLRequestJobFactory::MaybeInterceptResponse(
      net::URLRequest* request,
      net::NetworkDelegate* network_delegate) const {
    return next_factory_->MaybeInterceptResponse(request, network_delegate);
 }
 
 bool AwURLRequestJobFactory::SetProtocolHandler(
     const std::string& scheme,
     std::unique_ptr<ProtocolHandler> protocol_handler) {
   return next_factory_->SetProtocolHandler(scheme, std::move(protocol_handler));
 }
 
 bool AwURLRequestJobFactory::IsSafeRedirectTarget(const GURL& location) const {
   return next_factory_->IsSafeRedirectTarget(location);
 }
 
 } // namespace android_webview