Move all callers to EnsureWinsockInit, and away from using WinsockInit instances.

Review URL: http://codereview.chromium.org/6486

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@2874 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 7 insertions, 8 deletions

diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc
index 3cb98f1..590e3ff 100644
--- a/chrome/browser/browser_main.cc
+++ b/chrome/browser/browser_main.cc
@@ -423,7 +423,7 @@ int BrowserMain(CommandLine &parsed_command_line, int show_command,
   PrepareRestartOnCrashEnviroment(parsed_command_line);
 
   // Initialize Winsock.
-  net::WinsockInit init;
+  net::EnsureWinsockInit();
 
   // Initialize the DNS prefetch system
   chrome_browser_net::DnsPrefetcherInit dns_prefetch_init(user_prefs);
diff --git a/chrome/browser/net/dns_master_unittest.cc b/chrome/browser/net/dns_master_unittest.cc
index dafe690..1f95742 100644
--- a/chrome/browser/net/dns_master_unittest.cc
+++ b/chrome/browser/net/dns_master_unittest.cc
@@ -140,7 +140,7 @@ TimeDelta BlockingDnsLookup(const std::string& hostname) {
 // of DNS prefetching.
 TEST(DnsMasterTest, OsCachesLookupsTest) {
   SetupNetworkInfrastructure();
-  net::WinsockInit ws_init;
+  net::EnsureWinsockInit();
 
   for (int i = 0; i < 5; i++) {
     std::string badname;
@@ -160,7 +160,7 @@ TEST(DnsMasterTest, StartupShutdownTest) {
 
 TEST(DnsMasterTest, BenefitLookupTest) {
   SetupNetworkInfrastructure();
-  net::WinsockInit ws_init;
+  net::EnsureWinsockInit();
   DnsPrefetcherInit dns_init(NULL);  // Creates global service .
   DnsMaster testing_master(TimeDelta::FromMilliseconds(5000));
 
@@ -237,7 +237,7 @@ TEST(DnsMasterTest, BenefitLookupTest) {
 
 TEST(DnsMasterTest, DISABLED_SingleSlaveLookupTest) {
   SetupNetworkInfrastructure();
-  net::WinsockInit ws_init;
+  net::EnsureWinsockInit();
   DnsPrefetcherInit dns_init(NULL);  // Creates global service.
   DnsMaster testing_master(TimeDelta::FromMilliseconds(5000));
 
@@ -289,7 +289,7 @@ TEST(DnsMasterTest, DISABLED_SingleSlaveLookupTest) {
 
 TEST(DnsMasterTest, DISABLED_MultiThreadedLookupTest) {
   SetupNetworkInfrastructure();
-  net::WinsockInit ws_init;
+  net::EnsureWinsockInit();
   DnsMaster testing_master(TimeDelta::FromSeconds(30));
   DnsPrefetcherInit dns_init(NULL);
 
@@ -336,7 +336,7 @@ TEST(DnsMasterTest, DISABLED_MultiThreadedLookupTest) {
 
 TEST(DnsMasterTest, DISABLED_MultiThreadedSpeedupTest) {
   SetupNetworkInfrastructure();
-  net::WinsockInit ws_init;
+  net::EnsureWinsockInit();
   DnsMaster testing_master(TimeDelta::FromSeconds(30));
   DnsPrefetcherInit dns_init(NULL);
 
diff --git a/net/base/listen_socket_unittest.h b/net/base/listen_socket_unittest.h
index 36af167..97c592e 100644
--- a/net/base/listen_socket_unittest.h
+++ b/net/base/listen_socket_unittest.h
@@ -75,7 +75,7 @@ class ListenSocketTester :
     InitializeCriticalSection(&lock_);
     semaphore_ = CreateSemaphore(NULL, 0, MAX_QUEUE_SIZE, NULL);
     server_ = NULL;
-    net::WinsockInit::Init();
+    net::EnsureWinsockInit();
 
     thread_.reset(new base::Thread("socketio_test"));
     thread_->Start();
@@ -124,7 +124,6 @@ class ListenSocketTester :
     }
     thread_.reset();
     loop_ = NULL;
-    net::WinsockInit::Cleanup();
   }
 
   void ReportAction(const ListenSocketTestAction& action) {