Chromium Code Reviews| OLD | NEW |
|---|---|
| 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" |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 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 InitializeTestThreadNoNetworkChangeNotifier(); | |
|
szym
2013/01/20 06:52:08
Could you explain why this change is necessary?
| |
| 54 | |
| 53 network_change_notifier_.reset(net::NetworkChangeNotifier::CreateMock()); | 55 network_change_notifier_.reset(net::NetworkChangeNotifier::CreateMock()); |
| 54 | |
| 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 MessageLoopForIO()); | 66 message_loop_.reset(new MessageLoopForIO()); |
| 67 } | 67 } |
| OLD | NEW |