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

net/flip/flip_network_transaction.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 "net/flip/flip_network_transaction.h"
 
 #include "base/scoped_ptr.h"
 #include "base/compiler_specific.h"
 #include "base/field_trial.h"
 #include "base/string_util.h"
@@ skipping 284 matching lines @@
   next_state_ = STATE_INIT_CONNECTION_COMPLETE;
 
   std::string host = request_->url.HostNoBrackets();
   int port = request_->url.EffectiveIntPort();
 
   std::string connection_group = "flip.";
   connection_group.append(host);
 
   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
-
-// 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
+  DCHECK(flip_);
 
   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;
 }
 
 int FlipNetworkTransaction::DoInitConnectionComplete(int result) {
   if (result < 0)
     return result;
 
@@ skipping 64 matching lines @@
 }
 
 int FlipNetworkTransaction::DoReadBodyComplete(int result) {
   // TODO(mbelshe): record success or failure of the transaction?
   if (user_callback_)
     DoHttpTransactionCallback(result);
   return OK;
 }
 
 }  // namespace net