diff options
| author | mbelshe@google.com <mbelshe@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-04 00:17:13 +0000 |
|---|---|---|
| committer | mbelshe@google.com <mbelshe@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-04 00:17:13 +0000 |
| commit | eebc0b413d66975e86be3814103438c3ec154bec (patch) | |
| tree | d9e2ffbd86374f7fe8c778429e480c4cfea0a2dc /net/flip/flip_network_transaction.cc | |
| parent | ad464a2dbe69ed57ea146e3b6a9eb9451ff161ae (diff) | |
| download | chromium_src-eebc0b413d66975e86be3814103438c3ec154bec.zip chromium_src-eebc0b413d66975e86be3814103438c3ec154bec.tar.gz chromium_src-eebc0b413d66975e86be3814103438c3ec154bec.tar.bz2 | |
Update the FLIP session to use the FlipIOBuffer.
Also removed some of the testing hacks for URL rewriting
that are no longer needed.
This change removes the 'batching' of frames written
to the socket. The reason for doing this is because
I'm going to need to start notifying to the upper layer
as progress is made on the writes (e.g. upload notifications).
When the frames are batched (potentially from different
transactions), it becomes very difficult to know when each
write completes. I don't think that batching is necessary,
as writes will accummulate in the socket buffer, so this
should be a better approach.
BUG=none
TEST=flip_session_unittest.cc
Review URL: http://codereview.chromium.org/342088
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30898 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/flip/flip_network_transaction.cc')
| -rw-r--r-- | net/flip/flip_network_transaction.cc | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/net/flip/flip_network_transaction.cc b/net/flip/flip_network_transaction.cc index 77059fa..f0433ab 100644 --- a/net/flip/flip_network_transaction.cc +++ b/net/flip/flip_network_transaction.cc @@ -302,26 +302,8 @@ int FlipNetworkTransaction::DoInitConnection() { 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. |