Remove HttpStreamFactory's NPN/SPDY globals, except for spdy_enabled.

net/test/net_test_suite.cc

Index: net/test/net_test_suite.cc
diff --git a/net/test/net_test_suite.cc b/net/test/net_test_suite.cc
index 175cec297547f47f09c24fa69faef2d55a296f4c..2d13877e803678ab9013eca33882b2107e8dff84 100644
--- a/net/test/net_test_suite.cc
+++ b/net/test/net_test_suite.cc
@@ -1,67 +1,67 @@
-// 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 "net/test/net_test_suite.h"
-
-#include "base/message_loop/message_loop.h"
-#include "net/base/network_change_notifier.h"
-#include "net/http/http_stream_factory.h"
-#include "net/spdy/spdy_session.h"
-#include "testing/gtest/include/gtest/gtest.h"
-
-#if defined(USE_NSS) || defined(OS_IOS)
-#include "net/ocsp/nss_ocsp.h"
-#endif
-
-class StaticReset : public ::testing::EmptyTestEventListener {
-  virtual void OnTestStart(const ::testing::TestInfo& test_info) OVERRIDE {
-    net::HttpStreamFactory::ResetStaticSettingsToInit();
-  }
-};
-
-NetTestSuite::NetTestSuite(int argc, char** argv)
-    : TestSuite(argc, argv) {
-}
-
-NetTestSuite::NetTestSuite(int argc, char** argv,
-                           bool create_at_exit_manager)
-    : TestSuite(argc, argv, create_at_exit_manager) {
-}
-
-NetTestSuite::~NetTestSuite() {}
-
-void NetTestSuite::Initialize() {
-  TestSuite::Initialize();
-  ::testing::UnitTest::GetInstance()->listeners().Append(new StaticReset());
-  InitializeTestThread();
-}
-
-void NetTestSuite::Shutdown() {
-#if defined(USE_NSS) || defined(OS_IOS)
-  net::ShutdownNSSHttpIO();
-#endif
-
-  // We want to destroy this here before the TestSuite continues to tear down
-  // the environment.
-  message_loop_.reset();
-
-  TestSuite::Shutdown();
-}
-
-void NetTestSuite::InitializeTestThread() {
-  network_change_notifier_.reset(net::NetworkChangeNotifier::CreateMock());
-
-  InitializeTestThreadNoNetworkChangeNotifier();
-}
-
-void NetTestSuite::InitializeTestThreadNoNetworkChangeNotifier() {
-  host_resolver_proc_ = new net::RuleBasedHostResolverProc(NULL);
-  scoped_host_resolver_proc_.Init(host_resolver_proc_.get());
-  // In case any attempts are made to resolve host names, force them all to
-  // be mapped to localhost.  This prevents DNS queries from being sent in
-  // the process of running these unit tests.
-  host_resolver_proc_->AddRule("*", "127.0.0.1");
-
-  message_loop_.reset(new base::MessageLoopForIO());
-}
+// 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 "net/test/net_test_suite.h"
+
+#include "base/message_loop/message_loop.h"
+#include "net/base/network_change_notifier.h"
+#include "net/http/http_stream_factory.h"
+#include "net/spdy/spdy_session.h"
+#include "testing/gtest/include/gtest/gtest.h"
+
+#if defined(USE_NSS) || defined(OS_IOS)
+#include "net/ocsp/nss_ocsp.h"
+#endif
+
+class StaticReset : public ::testing::EmptyTestEventListener {
+  virtual void OnTestStart(const ::testing::TestInfo& test_info) OVERRIDE {
+    net::HttpStreamFactory::ResetStaticSettingsToInit();
+  }
+};
+
+NetTestSuite::NetTestSuite(int argc, char** argv)
+    : TestSuite(argc, argv) {
+}
+
+NetTestSuite::NetTestSuite(int argc, char** argv,
+                           bool create_at_exit_manager)
+    : TestSuite(argc, argv, create_at_exit_manager) {
+}
+
+NetTestSuite::~NetTestSuite() {}
+
+void NetTestSuite::Initialize() {
+  TestSuite::Initialize();
+  ::testing::UnitTest::GetInstance()->listeners().Append(new StaticReset());
+  InitializeTestThread();
+}
+
+void NetTestSuite::Shutdown() {
+#if defined(USE_NSS) || defined(OS_IOS)
+  net::ShutdownNSSHttpIO();
+#endif
+
+  // We want to destroy this here before the TestSuite continues to tear down
+  // the environment.
+  message_loop_.reset();
+
+  TestSuite::Shutdown();
+}
+
+void NetTestSuite::InitializeTestThread() {
+  network_change_notifier_.reset(net::NetworkChangeNotifier::CreateMock());
+
+  InitializeTestThreadNoNetworkChangeNotifier();
+}
+
+void NetTestSuite::InitializeTestThreadNoNetworkChangeNotifier() {
+  host_resolver_proc_ = new net::RuleBasedHostResolverProc(NULL);
+  scoped_host_resolver_proc_.Init(host_resolver_proc_.get());
+  // In case any attempts are made to resolve host names, force them all to
+  // be mapped to localhost.  This prevents DNS queries from being sent in
+  // the process of running these unit tests.
+  host_resolver_proc_->AddRule("*", "127.0.0.1");
+
+  message_loop_.reset(new base::MessageLoopForIO());
+}