Switch ObserverList::size() to ObserverList::might_have_observers() Pt.1

chromeos/dbus/shill_client_helper.cc

 // Copyright (c) 2012 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 "chromeos/dbus/shill_client_helper.h"
 
 #include "base/bind.h"
 #include "base/values.h"
 #include "chromeos/dbus/blocking_method_caller.h"
 #include "dbus/message.h"
@@ skipping 162 matching lines @@
 }  // namespace
 
 ShillClientHelper::ShillClientHelper(dbus::Bus* bus,
                                      dbus::ObjectProxy* proxy)
     : blocking_method_caller_(new BlockingMethodCaller(bus, proxy)),
       proxy_(proxy),
       weak_ptr_factory_(this) {
 }
 
 ShillClientHelper::~ShillClientHelper() {
-  LOG_IF(ERROR, observer_list_.size() != 0u)
-      << "ShillClientHelper destroyed with active observers: "
-      << observer_list_.size();
+  LOG_IF(ERROR, observer_list_.might_have_observers())
+      << "ShillClientHelper destroyed with active observers";
 }
 
 void ShillClientHelper::AddPropertyChangedObserver(
     ShillPropertyChangedObserver* observer) {
   // Excecute all the pending MonitorPropertyChanged calls.
   for (size_t i = 0; i < interfaces_to_be_monitored_.size(); ++i) {
     MonitorPropertyChangedInternal(interfaces_to_be_monitored_[i]);
   }
   interfaces_to_be_monitored_.clear();
 
   observer_list_.AddObserver(observer);
 }
 
 void ShillClientHelper::RemovePropertyChangedObserver(
     ShillPropertyChangedObserver* observer) {
   observer_list_.RemoveObserver(observer);
 }
 
 void ShillClientHelper::MonitorPropertyChanged(
     const std::string& interface_name) {
-  if (observer_list_.size() > 0) {
+  if (observer_list_.might_have_observers()) {
     // Effectively monitor the PropertyChanged now.
     MonitorPropertyChangedInternal(interface_name);
   } else {
     // Delay the ConnectToSignal until an observer is added.
     interfaces_to_be_monitored_.push_back(interface_name);
   }
 }
 
 void ShillClientHelper::MonitorPropertyChangedInternal(
     const std::string& interface_name) {
@@ skipping 250 matching lines @@
   scoped_ptr<base::Value> value(dbus::PopDataAsValue(&reader));
   if (!value.get())
     return;
 
   FOR_EACH_OBSERVER(ShillPropertyChangedObserver, observer_list_,
                     OnPropertyChanged(name, *value));
 }
 
 
 }  // namespace chromeos