Remove SPDY/3.1 tests.

net/http/http_stream_factory_impl_request_unittest.cc

 // Copyright (c) 2013 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/http/http_stream_factory_impl_request.h"
 
 #include <memory>
 
 #include "base/run_loop.h"
 #include "net/http/http_stream_factory_impl.h"
 #include "net/http/http_stream_factory_impl_job.h"
 #include "net/http/http_stream_factory_impl_job_controller.h"
 #include "net/http/http_stream_factory_test_util.h"
 #include "net/proxy/proxy_info.h"
 #include "net/proxy/proxy_service.h"
 #include "net/spdy/spdy_test_util_common.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using testing::_;
 
 namespace net {
 
-class HttpStreamFactoryImplRequestTest
-    : public ::testing::Test,
-      public ::testing::WithParamInterface<NextProto> {};
-
-INSTANTIATE_TEST_CASE_P(NextProto,
-                        HttpStreamFactoryImplRequestTest,
-                        testing::Values(kProtoSPDY31,
-                                        kProtoHTTP2));
+class HttpStreamFactoryImplRequestTest : public ::testing::Test {};
 
 // Make sure that Request passes on its priority updates to its jobs.
-TEST_P(HttpStreamFactoryImplRequestTest, SetPriority) {
-  SpdySessionDependencies session_deps(GetParam(),
-                                       ProxyService::CreateDirect());
+TEST_F(HttpStreamFactoryImplRequestTest, SetPriority) {
+  SpdySessionDependencies session_deps(ProxyService::CreateDirect());
   std::unique_ptr<HttpNetworkSession> session =
       SpdySessionDependencies::SpdyCreateSession(&session_deps);
   HttpStreamFactoryImpl* factory =
       static_cast<HttpStreamFactoryImpl*>(session->http_stream_factory());
   MockHttpStreamRequestDelegate request_delegate;
   TestJobFactory job_factory;
   HttpStreamFactoryImpl::JobController* job_controller =
       new HttpStreamFactoryImpl::JobController(factory, &request_delegate,
                                                session.get(), &job_factory);
   factory->job_controller_set_.insert(base::WrapUnique(job_controller));
@@ skipping 10 matching lines @@
   EXPECT_EQ(MEDIUM, job_controller->main_job()->priority());
 
   EXPECT_CALL(request_delegate, OnStreamFailed(_, _)).Times(1);
   job_controller->OnStreamFailed(job_factory.main_job(), ERR_FAILED,
                                  SSLConfig());
 
   request->SetPriority(IDLE);
   EXPECT_EQ(IDLE, job_controller->main_job()->priority());
 }
 
-TEST_P(HttpStreamFactoryImplRequestTest, DelayMainJob) {
-  SpdySessionDependencies session_deps(GetParam(),
-                                       ProxyService::CreateDirect());
+TEST_F(HttpStreamFactoryImplRequestTest, DelayMainJob) {
+  SpdySessionDependencies session_deps(ProxyService::CreateDirect());
 
   std::unique_ptr<HttpNetworkSession> session =
       SpdySessionDependencies::SpdyCreateSession(&session_deps);
 
   StaticSocketDataProvider socket_data;
   socket_data.set_connect_data(MockConnect(SYNCHRONOUS, ERR_IO_PENDING));
   session_deps.socket_factory->AddSocketDataProvider(&socket_data);
 
   HttpStreamFactoryImpl* factory =
       static_cast<HttpStreamFactoryImpl*>(session->http_stream_factory());
@@ skipping 52 matching lines @@
   base::PlatformThread::Sleep(base::TimeDelta::FromMilliseconds(wait_time + 1));
   base::RunLoop().RunUntilIdle();
 
   EXPECT_NE(delay, job->wait_time_);
   EXPECT_TRUE(job->wait_time_.is_zero());
   EXPECT_EQ(HttpStreamFactoryImpl::Job::STATE_INIT_CONNECTION_COMPLETE,
             job->next_state_);
 }
 
 }  // namespace net