Eliminate CrosLibrary::EnsureLoaded

chrome/browser/chromeos/sms_observer.cc

 // Copyright (c) 2011 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/sms_observer.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/notifications/system_notification.h"
 #include "chrome/browser/profiles/profile.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "third_party/cros/chromeos_network.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace chromeos {
 
 SmsObserver::SmsObserver(Profile* profile)
     : profile_(profile) {
   DCHECK(profile_);
-  if (!CrosLibrary::Get()->EnsureLoaded())
-    return;
-
   UpdateObservers(chromeos::CrosLibrary::Get()->GetNetworkLibrary());
 }
 
 SmsObserver::~SmsObserver() {
   NetworkLibrary* library = chromeos::CrosLibrary::Get()->GetNetworkLibrary();
   library->RemoveNetworkManagerObserver(this);
   DisconnectAll();
 }
 
 void SmsObserver::UpdateObservers(NetworkLibrary* library) {
-  if (!CrosLibrary::Get()->EnsureLoaded() ||
-      !CrosLibrary::Get()->GetNetworkLibrary()->IsCros())
+  // Guard against calls to libcros (http://crosbug.com/17863).
+  if (!CrosLibrary::Get()->libcros_loaded())
     return;
 
   const CellularNetworkVector& networks = library->cellular_networks();
   // Remove monitors for networks that are not in the list anymore.
   for (ObserversMap::iterator it_observer = observers_.begin();
        it_observer != observers_.end();) {
     bool found = false;
     for (CellularNetworkVector::const_iterator it_network = networks.begin();
         it_network != networks.end(); ++it_network) {
       if (it_observer->first == (*it_network)->device_path()) {
@@ skipping 25 matching lines @@
       chromeos::SMSMonitor monitor =
           chromeos::MonitorSMS(device_path.c_str(), &StaticCallback, this);
       observers_.insert(ObserversMap::value_type(device_path, monitor));
     } else {
       VLOG(1) << "Already has SMS monitor for " << device_path;
     }
   }
 }
 
 void SmsObserver::DisconnectAll() {
-  if (!CrosLibrary::Get()->EnsureLoaded() ||
-      !CrosLibrary::Get()->GetNetworkLibrary()->IsCros())
+  // Guard against calls to libcros (http://crosbug.com/17863).
+  if (!CrosLibrary::Get()->libcros_loaded())
     return;
 
   for (ObserversMap::iterator it = observers_.begin();
        it != observers_.end(); ++it) {
     VLOG(1) << "Remove SMS monitor for " << it->first;
     chromeos::DisconnectSMSMonitor(it->second);
   }
   observers_.clear();
 }
 
@@ skipping 18 matching lines @@
       profile_,
       "incoming _sms.chromeos",
       IDR_NOTIFICATION_SMS,
       l10n_util::GetStringFUTF16(
           IDS_SMS_NOTIFICATION_TITLE, UTF8ToUTF16(message->number)));
 
   note.Show(UTF8ToUTF16(message->text), true, false);
 }
 
 }  // namespace chromeos