Minor cleanups in HttpStreamFactoryImpl and member classes.

net/http/http_stream_factory_impl.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 "net/http/http_stream_factory_impl.h"
 
 #include <string>
 
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "base/stl_util.h"
 #include "base/strings/string_util.h"
 #include "net/http/http_network_session.h"
 #include "net/http/http_server_properties.h"
 #include "net/http/http_stream_factory_impl_job.h"
 #include "net/http/http_stream_factory_impl_job_controller.h"
 #include "net/http/http_stream_factory_impl_request.h"
 #include "net/http/transport_security_state.h"
 #include "net/log/net_log.h"
 #include "net/quic/core/quic_server_id.h"
 #include "net/spdy/bidirectional_stream_spdy_impl.h"
 #include "net/spdy/spdy_http_stream.h"
 #include "url/gurl.h"
+#include "url/url_constants.h"
 
 namespace net {
 
 namespace {
 // Default JobFactory for creating HttpStreamFactoryImpl::Jobs.
 class DefaultJobFactory : public HttpStreamFactoryImpl::JobFactory {
  public:
   DefaultJobFactory() {}
 
   ~DefaultJobFactory() override {}
@@ skipping 177 matching lines @@
     if (for_websockets_) {
       // TODO(ricea): Restore this code path when WebSocket over SPDY
       // implementation is ready.
       NOTREACHED();
     } else if (request->stream_type() ==
                HttpStreamRequest::BIDIRECTIONAL_STREAM) {
       request->OnBidirectionalStreamImplReady(
           used_ssl_config, used_proxy_info,
           new BidirectionalStreamSpdyImpl(spdy_session));
     } else {
-      bool use_relative_url = direct || request->url().SchemeIs("https");
+      bool use_relative_url =
+          direct || request->url().SchemeIs(url::kHttpsScheme);
       request->OnStreamReady(
           used_ssl_config, used_proxy_info,
           new SpdyHttpStream(spdy_session, use_relative_url));
     }
   }
   // TODO(mbelshe): Alert other valid requests.
 }
 
 void HttpStreamFactoryImpl::OnJobControllerComplete(JobController* controller) {
   for (auto it = job_controller_set_.begin(); it != job_controller_set_.end();
        ++it) {
     if (it->get() == controller) {
       job_controller_set_.erase(it);
       return;
     }
   }
   NOTREACHED();
 }
 
 }  // namespace net