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

BUG=chromium-os:4706
TEST=open chrome os, go to maps.google.com click my location, check it doesn't crash.

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

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

2 files changed, 5 insertions, 7 deletions

diff --git a/chrome/browser/geolocation/wifi_data_provider_chromeos.cc b/chrome/browser/geolocation/wifi_data_provider_chromeos.cc
index a13d2f7..c87386d 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() {
diff --git a/chrome/browser/geolocation/wifi_data_provider_chromeos.h b/chrome/browser/geolocation/wifi_data_provider_chromeos.h
index 36f2c5a..5f27e04 100644
--- a/chrome/browser/geolocation/wifi_data_provider_chromeos.h
+++ b/chrome/browser/geolocation/wifi_data_provider_chromeos.h
@@ -26,8 +26,6 @@ class WifiDataProviderChromeOs : public WifiDataProviderCommon {
   virtual WlanApiInterface* NewWlanApi();
   virtual PollingPolicyInterface* NewPollingPolicy();
 
-  scoped_ptr<chromeos::NetworkLibrary> network_library_;
-
   DISALLOW_COPY_AND_ASSIGN(WifiDataProviderChromeOs);
 };