Update the FLIP session to use the FlipIOBuffer....

net/flip/flip_network_transaction.cc

Index: net/flip/flip_network_transaction.cc
===================================================================
--- net/flip/flip_network_transaction.cc	(revision 30808)
+++ net/flip/flip_network_transaction.cc	(working copy)
@@ -302,27 +302,9 @@
 
   HostResolver::RequestInfo resolve_info(host, port);
 
-// TODO(mbelshe): Cleanup these testing tricks.
-// If we want to use multiple connections, grab the flip session
-// up front using the original domain name.
-#undef USE_MULTIPLE_CONNECTIONS
-#undef DIVERT_URLS_TO_TEST_SERVER
-#if defined(USE_MULTIPLE_CONNECTIONS) || !defined(DIVERT_URLS_TO_TEST_SERVER)
   flip_ = FlipSession::GetFlipSession(resolve_info, session_);
-#endif
+  DCHECK(flip_);
 
-// Use this to divert URLs to a test server.
-#ifdef DIVERT_URLS_TO_TEST_SERVER
-  // Fake out this session to go to our test server.
-  host = "servername";
-  port = 443;
-  resolve_info = HostResolver::RequestInfo(host, port);
-#ifndef USE_MULTIPLE_CONNECTIONS
-  flip_ = FlipSession::GetFlipSession(resolve_info, session_);
-#endif  // USE_MULTIPLE_CONNECTIONS
-
-#endif  // DIVERT_URLS_TO_TEST_SERVER
-
   int rv = flip_->Connect(connection_group, resolve_info, request_->priority);
   DCHECK(rv == net::OK);  // The API says it will always return OK.
   return net::OK;