Fix bug in net::RequestPriority -> HTTP/2 dependency conversion.

net/spdy/spdy_network_transaction_unittest.cc

 // Copyright (c) 2012 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 <string>
 #include <utility>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 122 matching lines @@
   return session_deps;
 }
 
 }  // namespace
 
 class SpdyNetworkTransactionTest
     : public ::testing::TestWithParam<SpdyNetworkTransactionTestParams> {
  protected:
   SpdyNetworkTransactionTest()
       : spdy_util_(GetParam().protocol, GetParam().priority_to_dependency) {
-    SpdySession::SetPriorityDependencyDefaultForTesting(
-        GetParam().priority_to_dependency);
+    old_dependency_default_ =
+        Http2PriorityDependencies::SetEnabledDefaultForTesting(
+            GetParam().priority_to_dependency);
     spdy_util_.set_default_url(GURL(GetDefaultUrl()));
   }
 
   virtual ~SpdyNetworkTransactionTest() {
     // UploadDataStream may post a deletion tasks back to the message loop on
     // destruction.
     upload_data_stream_.reset();
     base::RunLoop().RunUntilIdle();
-    SpdySession::SetPriorityDependencyDefaultForTesting(false);
+    Http2PriorityDependencies::SetEnabledDefaultForTesting(
+        old_dependency_default_);
   }
 
   void SetUp() override {
     get_request_initialized_ = false;
     post_request_initialized_ = false;
     chunked_post_request_initialized_ = false;
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
   }
 
   struct TransactionHelperResult {
@@ skipping 501 matching lines @@
   scoped_ptr<ChunkedUploadDataStream> upload_chunked_data_stream_;
   scoped_ptr<UploadDataStream> upload_data_stream_;
   bool get_request_initialized_;
   bool post_request_initialized_;
   bool chunked_post_request_initialized_;
   HttpRequestInfo get_request_;
   HttpRequestInfo post_request_;
   HttpRequestInfo chunked_post_request_;
   HttpRequestInfo get_push_request_;
   base::ScopedTempDir temp_dir_;
+  bool old_dependency_default_;
 };
 
 //-----------------------------------------------------------------------------
 // All tests are run with three different connection types: SPDY after NPN
 // negotiation, SPDY without SSL, and SPDY with SSL.
 //
 // TODO(akalin): Use ::testing::Combine() when we are able to use
 // <tr1/tuple>.
 INSTANTIATE_TEST_CASE_P(
     Spdy,
@@ skipping 5977 matching lines @@
 TEST_P(SpdyNetworkTransactionTLSUsageCheckTest, TLSCipherSuiteSucky) {
   scoped_ptr<SSLSocketDataProvider> ssl_provider(
       new SSLSocketDataProvider(ASYNC, OK));
   // Set to TLS_RSA_WITH_NULL_MD5
   SSLConnectionStatusSetCipherSuite(0x1, &ssl_provider->connection_status);
 
   RunTLSUsageCheckTest(std::move(ssl_provider));
 }
 
 }  // namespace net