Speculative fix for chromium-os:4706 - use singleton NetworkLibrary rather than create our own

chrome/browser/geolocation/wifi_data_provider_chromeos.cc

Index: chrome/browser/geolocation/wifi_data_provider_chromeos.cc
diff --git a/chrome/browser/geolocation/wifi_data_provider_chromeos.cc b/chrome/browser/geolocation/wifi_data_provider_chromeos.cc
index a13d2f77552407a5de3cd70b39e9cf06f6f538c5..c87386dcfae4ebca7704d9f925912e7e97aecdc4 100644
--- a/chrome/browser/geolocation/wifi_data_provider_chromeos.cc
+++ b/chrome/browser/geolocation/wifi_data_provider_chromeos.cc
@@ -85,11 +85,11 @@ WifiDataProviderCommon::WlanApiInterface*
 
 WifiDataProviderCommon::WlanApiInterface*
     WifiDataProviderChromeOs::NewWlanApi() {
-  if (network_library_ == NULL) {
-    network_library_.reset(chromeos::CrosLibrary::Get()->GetNetworkLibrary());
-    // TODO(joth): Check net_lib loaded ok, if not return NULL.
-  }
-  return NewWlanApi(network_library_.get());
+  chromeos::CrosLibrary* cros_lib = chromeos::CrosLibrary::Get();
+  DCHECK(cros_lib);
+  if (!cros_lib->EnsureLoaded())
+    return NULL;
+  return NewWlanApi(cros_lib->GetNetworkLibrary());
 }
 
 PollingPolicyInterface* WifiDataProviderChromeOs::NewPollingPolicy() {