Add HttpProtocolHandler and convert everything to use it

net/url_request/url_request_job_factory_impl.cc

 // Copyright (c) 2011 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 "net/url_request/url_request_job_factory_impl.h"
 
+#include "base/memory/ptr_util.h"
 #include "base/stl_util.h"
 #include "net/base/load_flags.h"
+#include "net/url_request/http_protocol_handler.h"
 #include "net/url_request/url_request_interceptor.h"
 #include "net/url_request/url_request_job_manager.h"
 #include "url/gurl.h"
 
 namespace net {
 
 namespace {
 
 URLRequestInterceptor* g_interceptor_for_testing = NULL;
 
 }  // namespace
 
 URLRequestJobFactoryImpl::URLRequestJobFactoryImpl() {}
 
 URLRequestJobFactoryImpl::~URLRequestJobFactoryImpl() {}
 
+// static
+std::unique_ptr<URLRequestJobFactoryImpl>
+URLRequestJobFactoryImpl::CreateWithDefaultProtocolHandlers() {
+  URLRequestJobFactoryImpl* job_factory = new URLRequestJobFactoryImpl;
+  job_factory->SetProtocolHandler("http",

[mmenke, 2016/04/21 20:58:01]

Maybe use the constants in url/url_constants instead?  Doesn't really matter too
much, but does help protect against typos.

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

Done.

+                                  base::WrapUnique(new HttpProtocolHandler));
+  job_factory->SetProtocolHandler("https",
+                                  base::WrapUnique(new HttpProtocolHandler));
+
+#if !defined(OS_IOS)
+  job_factory->SetProtocolHandler("ws",
+                                  base::WrapUnique(new HttpProtocolHandler));
+  job_factory->SetProtocolHandler("wss",
+                                  base::WrapUnique(new HttpProtocolHandler));
+#endif  // !defined(OS_IOS)
+
+  return base::WrapUnique(job_factory);

[mmenke, 2016/04/21 20:58:01]

Better to make job_factory a unique_ptr, and then just return it directly here. 
Should use raw pointers as rarely as you reasonably can.

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

Done.

+}
+
 bool URLRequestJobFactoryImpl::SetProtocolHandler(
     const std::string& scheme,
     std::unique_ptr<ProtocolHandler> protocol_handler) {
   DCHECK(CalledOnValidThread());
 
   if (!protocol_handler) {
     ProtocolHandlerMap::iterator it = protocol_handler_map_.find(scheme);
     if (it == protocol_handler_map_.end())
       return false;
 
@@ skipping 34 matching lines @@
 
 URLRequestJob* URLRequestJobFactoryImpl::MaybeInterceptResponse(
     URLRequest* request,
     NetworkDelegate* network_delegate) const {
   return nullptr;
 }
 
 bool URLRequestJobFactoryImpl::IsHandledProtocol(
     const std::string& scheme) const {
   DCHECK(CalledOnValidThread());
-  return ContainsKey(protocol_handler_map_, scheme) ||
-         URLRequestJobManager::SupportsScheme(scheme);
+  return ContainsKey(protocol_handler_map_, scheme);
 }
 
 bool URLRequestJobFactoryImpl::IsHandledURL(const GURL& url) const {
   if (!url.is_valid()) {
     // We handle error cases.
     return true;
   }
   return IsHandledProtocol(url.scheme());
 }
 
@@ skipping 15 matching lines @@
 
 // static
 void URLRequestJobFactoryImpl::SetInterceptorForTesting(
     URLRequestInterceptor* interceptor) {
   DCHECK(!interceptor || !g_interceptor_for_testing);
 
   g_interceptor_for_testing = interceptor;
 }
 
 }  // namespace net