Land for njw:...

chrome/browser/chromeos/cros/network_library.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.
 
 #include "chrome/browser/chromeos/cros/network_library.h"
 
 #include <algorithm>
 
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
@@ skipping 628 matching lines @@
   LOG(INFO) << "Getting initial CrOS network info.";
   UpdateSystemInfo();
 
   LOG(INFO) << "Registering for network status updates.";
   // Now, register to receive updates on network status.
   network_status_connection_ = MonitorNetwork(&NetworkStatusChangedHandler,
                                               this);
 }
 
 void NetworkLibraryImpl::UpdateSystemInfo() {
-  UpdateNetworkStatus();
+  if (CrosLibrary::Get()->EnsureLoaded()) {
+    UpdateNetworkStatus();
+  }
 }
 
 WifiNetwork* NetworkLibraryImpl::GetPreferredNetwork() {
   // First look for Google-A then look for Google.
   // Only care if set to auto-connect.
   WifiNetwork* wifi = GetWifiNetworkByName(kGoogleAWifi);
   // If wifi found and set to not auto-connect, then ignore it.
   if (wifi && !wifi->auto_connect())
     wifi = NULL;
 
@@ skipping 152 matching lines @@
   if (ethernet_connected())
     return ethernet_.ip_address();
   if (wifi_connected())
     return wifi_.ip_address();
   if (cellular_connected())
     return cellular_.ip_address();
   return ethernet_.ip_address();
 }
 
 }  // namespace chromeos