Replace more ObserverList with base::ObserverList.

chromeos/dbus/nfc_adapter_client.cc

 // Copyright 2013 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/nfc_adapter_client.h"
 
 #include <map>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 173 matching lines @@
             << " Property: " << property_name;
     FOR_EACH_OBSERVER(NfcAdapterClient::Observer, observers_,
                       AdapterPropertyChanged(object_path, property_name));
   }
 
   // We maintain a pointer to the bus to be able to request proxies for
   // new NFC adapters that appear.
   dbus::Bus* bus_;
 
   // List of observers interested in event notifications.
-  ObserverList<NfcAdapterClient::Observer> observers_;
+  base::ObserverList<NfcAdapterClient::Observer> observers_;
 
   // Mapping from object paths to object proxies and properties structures that
   // were already created by us.
   scoped_ptr<nfc_client_helpers::DBusObjectMap> object_map_;
 
   // The manager client that we listen to events notifications from.
   NfcManagerClient* manager_client_;
 
   // Weak pointer factory for generating 'this' pointers that might live longer
   // than we do.
   // Note: This should remain the last member so it'll be destroyed and
   // invalidate its weak pointers before any other members are destroyed.
   base::WeakPtrFactory<NfcAdapterClientImpl> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(NfcAdapterClientImpl);
 };
 
 NfcAdapterClient::NfcAdapterClient() {
 }
 
 NfcAdapterClient::~NfcAdapterClient() {
 }
 
 NfcAdapterClient* NfcAdapterClient::Create(NfcManagerClient* manager_client) {
   return new NfcAdapterClientImpl(manager_client);
 }
 
 }  // namespace chromeos