Flip: FlipSessionPool changes.

net/flip/flip_network_transaction_unittest.cc

 // Copyright (c) 2009 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 <math.h>  // ceil
 
 #include "base/compiler_specific.h"
 #include "net/base/completion_callback.h"
 #include "net/base/mock_host_resolver.h"
 #include "net/base/ssl_config_service_defaults.h"
 #include "net/base/ssl_info.h"
 #include "net/base/test_completion_callback.h"
 #include "net/base/upload_data.h"
 #include "net/flip/flip_network_transaction.h"
 #include "net/flip/flip_protocol.h"
 #include "net/http/http_auth_handler_ntlm.h"
 #include "net/http/http_network_session.h"
 #include "net/http/http_network_transaction.h"
 #include "net/http/http_transaction_unittest.h"
 #include "net/proxy/proxy_config_service_fixed.h"
 #include "net/socket/client_socket_factory.h"
 #include "net/socket/socket_test_util.h"
 #include "net/socket/ssl_client_socket.h"
 #include "testing/platform_test.h"
 
 //-----------------------------------------------------------------------------
 
+namespace net {
+
 namespace {
 
 // Create a proxy service which fails on all requests (falls back to direct).
-net::ProxyService* CreateNullProxyService() {
-  return net::ProxyService::CreateNull();
+ProxyService* CreateNullProxyService() {
+  return ProxyService::CreateNull();
 }
 
 // Helper to manage the lifetimes of the dependencies for a
 // HttpNetworkTransaction.
 class SessionDependencies {
  public:
   // Default set of dependencies -- "null" proxy service.
   SessionDependencies()
-      : host_resolver(new net::MockHostResolver),
+      : host_resolver(new MockHostResolver),
         proxy_service(CreateNullProxyService()),
-        ssl_config_service(new net::SSLConfigServiceDefaults) {}
+        ssl_config_service(new SSLConfigServiceDefaults),
+        flip_session_pool(new FlipSessionPool) {}
 
   // Custom proxy service dependency.
-  explicit SessionDependencies(net::ProxyService* proxy_service)
-      : host_resolver(new net::MockHostResolver),
+  explicit SessionDependencies(ProxyService* proxy_service)
+      : host_resolver(new MockHostResolver),
         proxy_service(proxy_service),
-        ssl_config_service(new net::SSLConfigServiceDefaults) {}
+        ssl_config_service(new SSLConfigServiceDefaults),
+        flip_session_pool(new FlipSessionPool) {}
 
-  scoped_refptr<net::MockHostResolverBase> host_resolver;
-  scoped_refptr<net::ProxyService> proxy_service;
-  scoped_refptr<net::SSLConfigService> ssl_config_service;
-  net::MockClientSocketFactory socket_factory;
+  scoped_refptr<MockHostResolverBase> host_resolver;
+  scoped_refptr<ProxyService> proxy_service;
+  scoped_refptr<SSLConfigService> ssl_config_service;
+  MockClientSocketFactory socket_factory;
+  scoped_refptr<FlipSessionPool> flip_session_pool;
 };
 
-net::ProxyService* CreateFixedProxyService(const std::string& proxy) {
-  net::ProxyConfig proxy_config;
+ProxyService* CreateFixedProxyService(const std::string& proxy) {
+  ProxyConfig proxy_config;
   proxy_config.proxy_rules.ParseFromString(proxy);
-  return net::ProxyService::CreateFixed(proxy_config);
+  return ProxyService::CreateFixed(proxy_config);
 }
 
 
-net::HttpNetworkSession* CreateSession(SessionDependencies* session_deps) {
-  return new net::HttpNetworkSession(session_deps->host_resolver,
-                                     session_deps->proxy_service,
-                                     &session_deps->socket_factory,
-                                     session_deps->ssl_config_service);
+HttpNetworkSession* CreateSession(SessionDependencies* session_deps) {
+  return new HttpNetworkSession(session_deps->host_resolver,
+                                session_deps->proxy_service,
+                                &session_deps->socket_factory,
+                                session_deps->ssl_config_service,
+                                session_deps->flip_session_pool);
 }
 
 }  // namespace
 
-namespace net {
-
 class FlipNetworkTransactionTest : public PlatformTest {
  public:
   virtual void SetUp() {
     // Disable compression on this test.
     flip::FlipFramer::set_enable_compression_default(false);
   }
 
   virtual void TearDown() {
     // Empty the current queue.
     MessageLoop::current()->RunAllPending();
@@ skipping 231 matching lines @@
   HttpRequestInfo request;
   request.method = "GET";
   request.url = GURL("http://www.google.com/");
   request.load_flags = 0;
   TransactionHelperResult out = TransactionHelper(request, data_reads, NULL);
   EXPECT_EQ(ERR_SYN_REPLY_NOT_RECEIVED, out.rv);
 }
 
 
 }  // namespace net
-