Merge 286628 "Merge 286598 "Disable SPDY and QUIC session pooling.""

net/quic/quic_stream_factory_test.cc

Index: net/quic/quic_stream_factory_test.cc
===================================================================
--- net/quic/quic_stream_factory_test.cc	(revision 286637)
+++ net/quic/quic_stream_factory_test.cc	(working copy)
@@ -351,7 +351,8 @@
   EXPECT_TRUE(socket_data2.at_write_eof());
 }
 
-TEST_P(QuicStreamFactoryTest, Pooling) {
+// TODO(rch): re-enable this.
+TEST_P(QuicStreamFactoryTest, DISABLED_Pooling) {
   MockRead reads[] = {
     MockRead(ASYNC, OK, 0)  // EOF
   };
@@ -467,7 +468,8 @@
   EXPECT_TRUE(socket_data2.at_write_eof());
 }
 
-TEST_P(QuicStreamFactoryTest, HttpsPooling) {
+// TODO(rch): re-enable this.
+TEST_P(QuicStreamFactoryTest, DISABLED_HttpsPooling) {
   MockRead reads[] = {
     MockRead(ASYNC, OK, 0)  // EOF
   };