diff options
| author | eroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-28 19:05:21 +0000 |
|---|---|---|
| committer | eroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-28 19:05:21 +0000 |
| commit | fb9b3fbc72c7c1aa1bcd7c7b6995ed75283e9c3e (patch) | |
| tree | 939294c130f06e2a43c4d94e12f5ed317997a6b2 | |
| parent | 9004f7299714fa85512eeb2d7023e0ee76875679 (diff) | |
| download | chromium_src-fb9b3fbc72c7c1aa1bcd7c7b6995ed75283e9c3e.zip chromium_src-fb9b3fbc72c7c1aa1bcd7c7b6995ed75283e9c3e.tar.gz chromium_src-fb9b3fbc72c7c1aa1bcd7c7b6995ed75283e9c3e.tar.bz2 | |
Make sure MockHostResolverWorks regardless of whether winsock has already been initialized yet.
BUG=145125
Review URL: https://chromiumcodereview.appspot.com/10872104
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@153707 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | net/base/mock_host_resolver.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/net/base/mock_host_resolver.cc b/net/base/mock_host_resolver.cc index cf288f6..efa7ae5 100644 --- a/net/base/mock_host_resolver.cc +++ b/net/base/mock_host_resolver.cc @@ -18,6 +18,9 @@ #include "net/base/net_errors.h" #include "net/base/net_util.h" #include "net/base/test_completion_callback.h" +#if defined(OS_WIN) +#include "net/base/winsock_init.h" +#endif namespace net { @@ -324,6 +327,9 @@ int RuleBasedHostResolverProc::Resolve(const std::string& host, case Rule::kResolverTypeFail: return ERR_NAME_NOT_RESOLVED; case Rule::kResolverTypeSystem: +#if defined(OS_WIN) + net::EnsureWinsockInit(); +#endif return SystemHostResolverProc(effective_host, address_family, host_resolver_flags, |