Add HttpProtocolHandler and convert everything to use it

android_webview/browser/net/aw_url_request_job_factory.cc

Index: android_webview/browser/net/aw_url_request_job_factory.cc
diff --git a/android_webview/browser/net/aw_url_request_job_factory.cc b/android_webview/browser/net/aw_url_request_job_factory.cc
index 0d8ddecff1c11e981f5752df85d339c92007f3db..ff3b9b8b0031b1972a2c95b01f23d625f488b3a2 100644
--- a/android_webview/browser/net/aw_url_request_job_factory.cc
+++ b/android_webview/browser/net/aw_url_request_job_factory.cc
@@ -18,20 +18,14 @@ using net::URLRequestJob;
 namespace android_webview {
 
 AwURLRequestJobFactory::AwURLRequestJobFactory()
-    : next_factory_(new net::URLRequestJobFactoryImpl()) {
-}
+    : next_factory_(
+          net::URLRequestJobFactoryImpl::CreateWithHttpProtocolHandlers()) {}
 
 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;
 }
 
@@ -49,15 +43,6 @@ URLRequestJob* AwURLRequestJobFactory::MaybeCreateJobWithProtocolHandler(
   if (job)
     return job;
 
-  // 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);
 }