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

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

Issue 623213004: replace OVERRIDE and FINAL with override and final in net/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: undo unwanted change in comment Created 6 years, 2 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/net_test_suite.h ('k') | net/test/spawned_test_server/local_test_server_posix.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) || 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 } 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)
(...skipping 29 matching lines...) Expand all
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/net_test_suite.h ('k') | net/test/spawned_test_server/local_test_server_posix.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698