Revert 54906 - Refactor HttpNetworkTransaction to eliminate the SPDY...

Revert 54906 - Refactor HttpNetworkTransaction to eliminate the SPDY
specific states of the state machine.  This required
adding two new states:

       STATE_INIT_STREAM
       STATE_INTI_STREAM_COMPLETE

The http_stream_ and spdy_http_stream_ member fields
have been removed, and replaced by a single stream_
member field which is initialized with either an
HttpBasicStream, or SpdyHttpStream depending on the
underlying connection.

In the process, the NetLog no longer receives TYPE_SPDY
events, only TYPE_HTTP, so spdy_network_transaction_unittest.cc
needed to be modified accordingly.

This seems to causing Valgrind leaks:

http://build.chromium.org/buildbot/memory/builders/Chromium%20Mac%20(valgrind)/builds/6887/steps/memory%20test:%20net/logs/stdio

E.g.:

Leak_DefinitelyLost
78,766 (888 direct, 77,878 indirect) bytes in 2 blocks are definitely lost in loss record 6,975 of 7,027
  operator new(unsigned long) (mp/vg-bins/scripts/valgrind-memcheck/coregrind/m_replacemalloc/vg_replace_malloc.c:276)
  net::SpdySessionPool::GetSpdySessionFromSocket(std::pair<net::HostPortPair, std::basic_string<char, std::char_traits<char>, std::allocator<char> > > const&, net::HttpNetworkSession*, net::ClientSocketHandle*, net::BoundNetLog const&, int, scoped_refptr<net::SpdySession>*, bool)
  net::HttpNetworkTransaction::DoInitStream()
  net::HttpNetworkTransaction::DoLoop(int)
  net::HttpNetworkTransaction::OnIOComplete(int)
  net::ClientSocketHandle::OnIOComplete(int)
  net::internal::ClientSocketPoolBaseHelper::InvokeUserCallback(net::ClientSocketHandle*)
  RunnableMethod<net::internal::ClientSocketPoolBaseHelper, void (net::internal::ClientSocketPoolBaseHelper::*)(net::ClientSocketHandle*), Tuple1<net::ClientSocketHandle*> >::Run()
  MessageLoop::RunTask(Task*)
  MessageLoop::DeferOrRunPendingTask(MessageLoop::PendingTask const&)
  MessageLoop::DoWork()
  base::MessagePumpLibevent::Run(base::MessagePump::Delegate*)
  MessageLoop::RunInternal()
  MessageLoop::Run()
  TestCompletionCallback::WaitForResult()
  net::SpdyNetworkTransactionTest_SocketWriteReturnsZero_Test::TestBody()
  testing::Test::Run()
  testing::internal::TestInfoImpl::Run()
  testing::TestCase::Run()
  testing::internal::UnitTestImpl::RunAllTests()
  TestSuite::Run()
  main
Suppression (error hash=#-444E9002#):
{
   <insert_a_suppression_name_here>
   Memcheck:Leak
   fun:_Znw*
   fun:_ZN3net15SpdySessionPool24GetSpdySessionFromSocketERKSt4pairINS_12HostPortPairESsEPNS_18HttpNetworkSessionEPNS_18ClientSocketHandleERKNS_11BoundNetLogEiP13scoped_refptrINS_11SpdySessionEEb
   fun:_ZN3net22HttpNetworkTransaction12DoInitStreamEv
   fun:_ZN3net22HttpNetworkTransaction6DoLoopEi
   fun:_ZN3net22HttpNetworkTransaction12OnIOCompleteEi
   fun:_ZN3net18ClientSocketHandle12OnIOCompleteEi
   fun:_ZN3net8internal26ClientSocketPoolBaseHelper18InvokeUserCallbackEPNS_18ClientSocketHandleE
   fun:_ZN14RunnableMethodIN3net8internal26ClientSocketPoolBaseHelperEMS2_FvPNS0_18ClientSocketHandleEE6Tuple1IS4_EE3RunEv
   fun:_ZN11MessageLoop7RunTaskEP4Task
   fun:_ZN11MessageLoop21DeferOrRunPendingTaskERKNS_11PendingTaskE
   fun:_ZN11MessageLoop6DoWorkEv
   fun:_ZN4base19MessagePumpLibevent3RunEPNS_11MessagePump8DelegateE
   fun:_ZN11MessageLoop11RunInternalEv
}


BUG=50267
TEST=none

Review URL: http://codereview.chromium.org/3064033

TBR=rch@chromium.org

Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=54963

[dhollowa, 2010-08-04 21:03:51]

Also:

http://build.chromium.org/buildbot/memory/builders/Linux%20Heapcheck/builds/6...

Eg.

...

Leak of 8 bytes in 1 objects allocated from:
	@ 90610d RefCountedBase
	@ 87a9dd RefCounted
	@ 876566 SpdySession
	@ 87d5ac net::SpdySessionPool::GetSpdySessionFromSocket
	@ 7eeada net::HttpNetworkTransaction::DoInitStream
	@ 7f3151 net::HttpNetworkTransaction::DoLoop
	@ 7f37eb net::HttpNetworkTransaction::OnIOComplete
	@ 7f4b99 void DispatchToMethod
	@ 7f4bc9 CallbackImpl::RunWithParams
	@ 4b3a10 CallbackRunner::Run
	@ 832f78 net::ClientSocketHandle::OnIOComplete
	@ 833251 void DispatchToMethod
	@ 833281 CallbackImpl::RunWithParams
	@ 4b3a10 CallbackRunner::Run
	@ 8338aa net::internal::ClientSocketPoolBaseHelper::InvokeUserCallback
	@ 83c298 void DispatchToMethod
	@ 83c2d4 RunnableMethod::Run
	@ 8f138b MessageLoop::RunTask
	@ 8f1454 MessageLoop::DeferOrRunPendingTask
	@ 8f16a4 MessageLoop::DoWork
	@ 93d37a base::MessagePumpLibevent::Run
	@ 8f1e17 MessageLoop::RunInternal
	@ 8f1e37 MessageLoop::RunHandler
	@ 8f1edc MessageLoop::Run
	@ 44b7f9 TestCompletionCallback::WaitForResult
	@ 5a7a57
net::HttpNetworkTransactionTest_UseAlternateProtocolForNpnSpdy_Test::TestBody
	@ 960dd5 testing::Test::Run
	@ 9645ca testing::internal::TestInfoImpl::Run
	@ 964700 testing::TestCase::Run
	@ 965162 testing::internal::UnitTestImpl::RunAllTests
	@ 9652d9 testing::UnitTest::Run
	@ 4a4bf7 TestSuite::Run

Suppression:
{
   <insert_a_suppression_name_here>
   Heapcheck:Leak
   fun:RefCountedBase
   fun:RefCounted
   fun:SpdySession
   fun:net::SpdySessionPool::GetSpdySessionFromSocket
   fun:net::HttpNetworkTransaction::DoInitStream
   fun:net::HttpNetworkTransaction::DoLoop
   fun:net::HttpNetworkTransaction::OnIOComplete
   fun:void DispatchToMethod
   fun:CallbackImpl::RunWithParams
   fun:CallbackRunner::Run
   fun:net::ClientSocketHandle::OnIOComplete
   fun:void DispatchToMethod
   fun:CallbackImpl::RunWithParams
   fun:CallbackRunner::Run
   fun:net::internal::ClientSocketPoolBaseHelper::InvokeUserCallback
   fun:void DispatchToMethod
   fun:RunnableMethod::Run
   fun:MessageLoop::RunTask
   fun:MessageLoop::DeferOrRunPendingTask
   fun:MessageLoop::DoWork
   fun:base::MessagePumpLibevent::Run
   fun:MessageLoop::RunInternal
   fun:MessageLoop::RunHandler
   fun:MessageLoop::Run
   fun:TestCompletionCallback::WaitForResult
  
fun:net::HttpNetworkTransactionTest_UseAlternateProtocolForNpnSpdy_Test::TestBody
   fun:testing::Test::Run
   fun:testing::internal::TestInfoImpl::Run
   fun:testing::TestCase::Run
   fun:testing::internal::UnitTestImpl::RunAllTests
   fun:testing::UnitTest::Run
   fun:TestSuite::Run
}



Leak of 8 bytes in 1 objects allocated from:
	@ 90610d RefCountedBase
	@ 87a9dd RefCounted
	@ 876566 SpdySession
	@ 87d820 net::SpdySessionPool::Get
	@ 5a4930
net::HttpNetworkTransactionTest_UseAlternateProtocolForNpnSpdyWithExistingSpdySession_Test::TestBody
	@ 960dd5 testing::Test::Run
	@ 9645ca testing::internal::TestInfoImpl::Run
	@ 964700 testing::TestCase::Run
	@ 965162 testing::internal::UnitTestImpl::RunAllTests
	@ 9652d9 testing::UnitTest::Run
	@ 4a4bf7 TestSuite::Run
	@ 4a3b6d main
	@ 2b7258d251c4 __libc_start_main

Suppression:
{
   <insert_a_suppression_name_here>
   Heapcheck:Leak
   fun:RefCountedBase
   fun:RefCounted
   fun:SpdySession
   fun:net::SpdySessionPool::Get
  
fun:net::HttpNetworkTransactionTest_UseAlternateProtocolForNpnSpdyWithExistingSpdySession_Test::TestBody
   fun:testing::Test::Run
   fun:testing::internal::TestInfoImpl::Run
   fun:testing::TestCase::Run
   fun:testing::internal::UnitTestImpl::RunAllTests
   fun:testing::UnitTest::Run
   fun:TestSuite::Run
   fun:main
   fun:__libc_start_main
}