8 files changed, 52 insertions, 31 deletions
diff --git a/net/http/http_auth.cc b/net/http/http_auth.cc
index 2e42b06..47a13be2 100644
--- a/net/http/http_auth.cc
+++ b/net/http/http_auth.cc
@@ -86,6 +86,18 @@ HttpAuth::AuthorizationResult HttpAuth::HandleChallengeResponse(
   return HttpAuth::AUTHORIZATION_RESULT_REJECT;
 }
 
+HttpAuth::ChallengeTokenizer::ChallengeTokenizer(
+    std::string::const_iterator begin,
+    std::string::const_iterator end)
+    : begin_(begin),
+      end_(end),
+      scheme_begin_(begin),
+      scheme_end_(begin),
+      params_begin_(end),
+      params_end_(end) {
+  Init(begin, end);
+}
+
 HttpUtil::NameValuePairsIterator HttpAuth::ChallengeTokenizer::param_pairs()
     const {
   return HttpUtil::NameValuePairsIterator(params_begin_, params_end_, ',');
diff --git a/net/http/http_auth.h b/net/http/http_auth.h
index a42fc20..364f933 100644
--- a/net/http/http_auth.h
+++ b/net/http/http_auth.h
@@ -178,15 +178,7 @@ class NET_EXPORT_PRIVATE HttpAuth {
   class NET_EXPORT_PRIVATE ChallengeTokenizer {
    public:
     ChallengeTokenizer(std::string::const_iterator begin,
-                       std::string::const_iterator end)
-        : begin_(begin),
-          end_(end),
-          scheme_begin_(begin),
-          scheme_end_(begin),
-          params_begin_(end),
-          params_end_(end) {
-      Init(begin, end);
-    }
+                       std::string::const_iterator end);
 
     // Get the original text.
     std::string challenge_text() const {
diff --git a/net/http/http_network_session.cc b/net/http/http_network_session.cc
index 0d9b459..124c570 100644
--- a/net/http/http_network_session.cc
+++ b/net/http/http_network_session.cc
@@ -46,6 +46,20 @@ net::ClientSocketPoolManager* CreateSocketPoolManager(
 
 namespace net {
 
+HttpNetworkSession::Params::Params()
+    : client_socket_factory(NULL),
+      host_resolver(NULL),
+      cert_verifier(NULL),
+      server_bound_cert_service(NULL),
+      transport_security_state(NULL),
+      proxy_service(NULL),
+      ssl_config_service(NULL),
+      http_auth_handler_factory(NULL),
+      network_delegate(NULL),
+      http_server_properties(NULL),
+      net_log(NULL),
+      force_http_pipelining(false) {}
+
 // TODO(mbelshe): Move the socket factories into HttpStreamFactory.
 HttpNetworkSession::HttpNetworkSession(const Params& params)
     : net_log_(params.net_log),
diff --git a/net/http/http_network_session.h b/net/http/http_network_session.h
index 35b4bd0..3a9d72c 100644
--- a/net/http/http_network_session.h
+++ b/net/http/http_network_session.h
@@ -47,19 +47,7 @@ class NET_EXPORT HttpNetworkSession
       NON_EXPORTED_BASE(public base::NonThreadSafe) {
  public:
   struct NET_EXPORT Params {
-    Params()
-        : client_socket_factory(NULL),
-          host_resolver(NULL),
-          cert_verifier(NULL),
-          server_bound_cert_service(NULL),
-          transport_security_state(NULL),
-          proxy_service(NULL),
-          ssl_config_service(NULL),
-          http_auth_handler_factory(NULL),
-          network_delegate(NULL),
-          http_server_properties(NULL),
-          net_log(NULL),
-          force_http_pipelining(false) {}
+    Params();
 
     ClientSocketFactory* client_socket_factory;
     HostResolver* host_resolver;
diff --git a/net/http/http_pipelined_connection_impl.cc b/net/http/http_pipelined_connection_impl.cc
index 1679cbc..141d58a 100644
--- a/net/http/http_pipelined_connection_impl.cc
+++ b/net/http/http_pipelined_connection_impl.cc
@@ -52,6 +52,22 @@ Value* NetLogHostPortPairCallback(const HostPortPair* host_port_pair,
 
 }  // anonymous namespace
 
+HttpPipelinedConnection*
+HttpPipelinedConnectionImpl::Factory::CreateNewPipeline(
+    ClientSocketHandle* connection,
+    HttpPipelinedConnection::Delegate* delegate,
+    const HostPortPair& origin,
+    const SSLConfig& used_ssl_config,
+    const ProxyInfo& used_proxy_info,
+    const BoundNetLog& net_log,
+    bool was_npn_negotiated,
+    NextProto protocol_negotiated) {
+  return new HttpPipelinedConnectionImpl(connection, delegate, origin,
+                                         used_ssl_config, used_proxy_info,
+                                         net_log, was_npn_negotiated,
+                                         protocol_negotiated);
+}
+
 HttpPipelinedConnectionImpl::HttpPipelinedConnectionImpl(
     ClientSocketHandle* connection,
     HttpPipelinedConnection::Delegate* delegate,
diff --git a/net/http/http_pipelined_connection_impl.h b/net/http/http_pipelined_connection_impl.h
index be62885..ac43dcb 100644
--- a/net/http/http_pipelined_connection_impl.h
+++ b/net/http/http_pipelined_connection_impl.h
@@ -55,12 +55,7 @@ class NET_EXPORT_PRIVATE HttpPipelinedConnectionImpl
         const ProxyInfo& used_proxy_info,
         const BoundNetLog& net_log,
         bool was_npn_negotiated,
-        NextProto protocol_negotiated) OVERRIDE {
-      return new HttpPipelinedConnectionImpl(connection, delegate, origin,
-                                             used_ssl_config, used_proxy_info,
-                                             net_log, was_npn_negotiated,
-                                             protocol_negotiated);
-    }
+        NextProto protocol_negotiated) OVERRIDE;
   };
 
   HttpPipelinedConnectionImpl(ClientSocketHandle* connection,
diff --git a/net/http/http_proxy_client_socket_pool.cc b/net/http/http_proxy_client_socket_pool.cc
index 249a052..8991735 100644
--- a/net/http/http_proxy_client_socket_pool.cc
+++ b/net/http/http_proxy_client_socket_pool.cc
@@ -380,6 +380,12 @@ HttpProxyClientSocketPool::HttpProxyConnectJobFactory::NewConnectJob(
                                  net_log_);
 }
 
+base::TimeDelta
+HttpProxyClientSocketPool::HttpProxyConnectJobFactory::ConnectionTimeout(
+    ) const {
+  return timeout_;
+}
+
 HttpProxyClientSocketPool::HttpProxyClientSocketPool(
     int max_sockets,
     int max_sockets_per_group,
diff --git a/net/http/http_proxy_client_socket_pool.h b/net/http/http_proxy_client_socket_pool.h
index f6a83ef..867131c 100644
--- a/net/http/http_proxy_client_socket_pool.h
+++ b/net/http/http_proxy_client_socket_pool.h
@@ -252,9 +252,7 @@ class NET_EXPORT_PRIVATE HttpProxyClientSocketPool
         const PoolBase::Request& request,
         ConnectJob::Delegate* delegate) const OVERRIDE;
 
-    virtual base::TimeDelta ConnectionTimeout() const OVERRIDE {
-      return timeout_;
-    }
+    virtual base::TimeDelta ConnectionTimeout() const OVERRIDE;
 
    private:
     TransportClientSocketPool* const transport_pool_;