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

chrome/browser/geolocation/wifi_data_provider_chromeos.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Provides wifi scan API binding for chromeos, using proprietary APIs.
 
 #include "chrome/browser/geolocation/wifi_data_provider_chromeos.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
@@ skipping 67 matching lines @@
 WifiDataProviderChromeOs::~WifiDataProviderChromeOs() {
 }
 
 WifiDataProviderCommon::WlanApiInterface*
     WifiDataProviderChromeOs::NewWlanApi(chromeos::NetworkLibrary* lib) {
   return new chromeos::NetworkLibraryWlanApi(lib);
 }
 
 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() {
   return new GenericPollingPolicy<kDefaultPollingIntervalMilliseconds,
                                   kNoChangePollingIntervalMilliseconds,
                                   kTwoNoChangePollingIntervalMilliseconds,
                                   kNoWifiPollingIntervalMilliseconds>;
 }