Add HttpProtocolHandler and convert everything to use it

android_webview/browser/net/aw_url_request_context_getter.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_context_getter.h"
 
 #include <utility>
 #include <vector>
 
 #include "android_webview/browser/aw_browser_context.h"
@@ skipping 31 matching lines @@
 #include "net/http/http_auth_handler_factory.h"
 #include "net/http/http_auth_preferences.h"
 #include "net/http/http_cache.h"
 #include "net/http/http_stream_factory.h"
 #include "net/log/net_log.h"
 #include "net/proxy/proxy_service.h"
 #include "net/socket/next_proto.h"
 #include "net/ssl/channel_id_service.h"
 #include "net/url_request/data_protocol_handler.h"
 #include "net/url_request/file_protocol_handler.h"
+#include "net/url_request/http_protocol_handler.h"
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_context_builder.h"
 #include "net/url_request/url_request_intercepting_job_factory.h"
 #include "net/url_request/url_request_interceptor.h"
 
 using content::BrowserThread;
 
 namespace android_webview {
 
 
@@ skipping 35 matching lines @@
 }
 
 std::unique_ptr<net::URLRequestJobFactory> CreateJobFactory(
     content::ProtocolHandlerMap* protocol_handlers,
     content::URLRequestInterceptorScopedVector request_interceptors) {
   std::unique_ptr<AwURLRequestJobFactory> aw_job_factory(
       new AwURLRequestJobFactory);
   // Note that the registered schemes must also be specified in
   // AwContentBrowserClient::IsHandledURL.
   bool set_protocol = aw_job_factory->SetProtocolHandler(
+      url::kHttpScheme, base::WrapUnique(new net::HttpProtocolHandler));
+  DCHECK(set_protocol);
+  set_protocol = aw_job_factory->SetProtocolHandler(
+      url::kHttpsScheme, base::WrapUnique(new net::HttpProtocolHandler));
+  DCHECK(set_protocol);
+  set_protocol = aw_job_factory->SetProtocolHandler(
+      url::kWsScheme, base::WrapUnique(new net::HttpProtocolHandler));
+  DCHECK(set_protocol);
+  set_protocol = aw_job_factory->SetProtocolHandler(
+      url::kWssScheme, base::WrapUnique(new net::HttpProtocolHandler));
+  DCHECK(set_protocol);

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

Maybe make AwURLRequestJobFactory::AwURLRequestJobFactory use
CreateWithDefaultProtocolHandlers()?

[mgersh, 2016/04/22 20:27:15]

Done.

+  set_protocol = aw_job_factory->SetProtocolHandler(
       url::kFileScheme,
       base::WrapUnique(new net::FileProtocolHandler(
           content::BrowserThread::GetBlockingPool()
               ->GetTaskRunnerWithShutdownBehavior(
                   base::SequencedWorkerPool::SKIP_ON_SHUTDOWN))));
   DCHECK(set_protocol);
   set_protocol = aw_job_factory->SetProtocolHandler(
       url::kDataScheme, base::WrapUnique(new net::DataProtocolHandler()));
   DCHECK(set_protocol);
   set_protocol = aw_job_factory->SetProtocolHandler(
@@ skipping 213 matching lines @@
   http_auth_preferences_->set_server_whitelist(
       auth_server_whitelist_.GetValue());
 }
 
 void AwURLRequestContextGetter::UpdateAndroidAuthNegotiateAccountType() {
   http_auth_preferences_->set_auth_android_negotiate_account_type(
       auth_android_negotiate_account_type_.GetValue());
 }
 
 }  // namespace android_webview