Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(7)

Side by Side Diff: net/test/net_test_suite.cc

Issue 1082123003: Rename USE_NSS to USE_NSS_CERTS. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@use-nss-certs
Patch Set: rebase Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « net/test/cert_test_util.h ('k') | net/url_request/url_fetcher_impl_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "net/test/net_test_suite.h" 5 #include "net/test/net_test_suite.h"
6 6
7 #include "base/message_loop/message_loop.h" 7 #include "base/message_loop/message_loop.h"
8 #include "net/base/network_change_notifier.h" 8 #include "net/base/network_change_notifier.h"
9 #include "net/http/http_stream_factory.h" 9 #include "net/http/http_stream_factory.h"
10 #include "net/spdy/spdy_session.h" 10 #include "net/spdy/spdy_session.h"
11 #include "testing/gtest/include/gtest/gtest.h" 11 #include "testing/gtest/include/gtest/gtest.h"
12 12
13 #if defined(USE_NSS) || defined(OS_IOS) 13 #if defined(USE_NSS_CERTS) || defined(OS_IOS)
14 #include "net/cert_net/nss_ocsp.h" 14 #include "net/cert_net/nss_ocsp.h"
15 #endif 15 #endif
16 16
17 class StaticReset : public ::testing::EmptyTestEventListener { 17 class StaticReset : public ::testing::EmptyTestEventListener {
18 virtual void OnTestStart(const ::testing::TestInfo& test_info) override { 18 virtual void OnTestStart(const ::testing::TestInfo& test_info) override {
19 net::HttpStreamFactory::ResetStaticSettingsToInit(); 19 net::HttpStreamFactory::ResetStaticSettingsToInit();
20 } 20 }
21 }; 21 };
22 22
23 NetTestSuite::NetTestSuite(int argc, char** argv) 23 NetTestSuite::NetTestSuite(int argc, char** argv)
24 : TestSuite(argc, argv) { 24 : TestSuite(argc, argv) {
25 } 25 }
26 26
27 NetTestSuite::NetTestSuite(int argc, char** argv, 27 NetTestSuite::NetTestSuite(int argc, char** argv,
28 bool create_at_exit_manager) 28 bool create_at_exit_manager)
29 : TestSuite(argc, argv, create_at_exit_manager) { 29 : TestSuite(argc, argv, create_at_exit_manager) {
30 } 30 }
31 31
32 NetTestSuite::~NetTestSuite() {} 32 NetTestSuite::~NetTestSuite() {}
33 33
34 void NetTestSuite::Initialize() { 34 void NetTestSuite::Initialize() {
35 TestSuite::Initialize(); 35 TestSuite::Initialize();
36 ::testing::UnitTest::GetInstance()->listeners().Append(new StaticReset()); 36 ::testing::UnitTest::GetInstance()->listeners().Append(new StaticReset());
37 InitializeTestThread(); 37 InitializeTestThread();
38 } 38 }
39 39
40 void NetTestSuite::Shutdown() { 40 void NetTestSuite::Shutdown() {
41 #if defined(USE_NSS) || defined(OS_IOS) 41 #if defined(USE_NSS_CERTS) || defined(OS_IOS)
42 net::ShutdownNSSHttpIO(); 42 net::ShutdownNSSHttpIO();
43 #endif 43 #endif
44 44
45 // We want to destroy this here before the TestSuite continues to tear down 45 // We want to destroy this here before the TestSuite continues to tear down
46 // the environment. 46 // the environment.
47 message_loop_.reset(); 47 message_loop_.reset();
48 48
49 TestSuite::Shutdown(); 49 TestSuite::Shutdown();
50 } 50 }
51 51
52 void NetTestSuite::InitializeTestThread() { 52 void NetTestSuite::InitializeTestThread() {
53 network_change_notifier_.reset(net::NetworkChangeNotifier::CreateMock()); 53 network_change_notifier_.reset(net::NetworkChangeNotifier::CreateMock());
54 54
55 InitializeTestThreadNoNetworkChangeNotifier(); 55 InitializeTestThreadNoNetworkChangeNotifier();
56 } 56 }
57 57
58 void NetTestSuite::InitializeTestThreadNoNetworkChangeNotifier() { 58 void NetTestSuite::InitializeTestThreadNoNetworkChangeNotifier() {
59 host_resolver_proc_ = new net::RuleBasedHostResolverProc(NULL); 59 host_resolver_proc_ = new net::RuleBasedHostResolverProc(NULL);
60 scoped_host_resolver_proc_.Init(host_resolver_proc_.get()); 60 scoped_host_resolver_proc_.Init(host_resolver_proc_.get());
61 // In case any attempts are made to resolve host names, force them all to 61 // In case any attempts are made to resolve host names, force them all to
62 // be mapped to localhost. This prevents DNS queries from being sent in 62 // be mapped to localhost. This prevents DNS queries from being sent in
63 // the process of running these unit tests. 63 // the process of running these unit tests.
64 host_resolver_proc_->AddRule("*", "127.0.0.1"); 64 host_resolver_proc_->AddRule("*", "127.0.0.1");
65 65
66 message_loop_.reset(new base::MessageLoopForIO()); 66 message_loop_.reset(new base::MessageLoopForIO());
67 } 67 }
OLDNEW
« no previous file with comments | « net/test/cert_test_util.h ('k') | net/url_request/url_fetcher_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698