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

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

Issue 11415219: Move a number of static variables SPDY to HttpNetworkSession::Params. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix flip_in_mem_edsm_server Created 8 years 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 | Annotate | Revision Log
« no previous file with comments | « chrome/browser/profiles/profile_io_data.cc ('k') | net/http/http_network_session.h » ('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/base/net_test_suite.h" 5 #include "net/base/net_test_suite.h"
6 6
7 #include "base/message_loop.h" 7 #include "base/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) || defined(OS_IOS)
14 #include "net/ocsp/nss_ocsp.h" 14 #include "net/ocsp/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 net::SpdySession::ResetStaticSettingsToInit();
21 } 20 }
22 }; 21 };
23 22
24 NetTestSuite::NetTestSuite(int argc, char** argv) 23 NetTestSuite::NetTestSuite(int argc, char** argv)
25 : TestSuite(argc, argv) { 24 : TestSuite(argc, argv) {
26 } 25 }
27 26
28 NetTestSuite::NetTestSuite(int argc, char** argv, 27 NetTestSuite::NetTestSuite(int argc, char** argv,
29 bool create_at_exit_manager) 28 bool create_at_exit_manager)
30 : TestSuite(argc, argv, create_at_exit_manager) { 29 : TestSuite(argc, argv, create_at_exit_manager) {
(...skipping 28 matching lines...) Expand all
59 void NetTestSuite::InitializeTestThreadNoNetworkChangeNotifier() { 58 void NetTestSuite::InitializeTestThreadNoNetworkChangeNotifier() {
60 host_resolver_proc_ = new net::RuleBasedHostResolverProc(NULL); 59 host_resolver_proc_ = new net::RuleBasedHostResolverProc(NULL);
61 scoped_host_resolver_proc_.Init(host_resolver_proc_.get()); 60 scoped_host_resolver_proc_.Init(host_resolver_proc_.get());
62 // 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
63 // 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
64 // the process of running these unit tests. 63 // the process of running these unit tests.
65 host_resolver_proc_->AddRule("*", "127.0.0.1"); 64 host_resolver_proc_->AddRule("*", "127.0.0.1");
66 65
67 message_loop_.reset(new MessageLoopForIO()); 66 message_loop_.reset(new MessageLoopForIO());
68 } 67 }
OLDNEW
« no previous file with comments | « chrome/browser/profiles/profile_io_data.cc ('k') | net/http/http_network_session.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698