Replace more ObserverList with base::ObserverList.

chromeos/dbus/metronome_client.cc

 // Copyright 2015 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/metronome_client.h"
 
 #include "base/bind.h"
 #include "base/rand_util.h"
 #include "base/command_line.h"
 #include "base/logging.h"
@@ skipping 47 matching lines @@
   void OnSignalConnected(const std::string& interface,
                          const std::string& signal,
                          bool succeeded);
 
   dbus::ObjectProxy* proxy_;
 
   // True when |proxy_| has been connected.
   bool signal_connected_;
 
   // List of observers interested in event notifications from us.
-  ObserverList<Observer> observers_;
+  base::ObserverList<Observer> observers_;
 
   // 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<MetronomeClientImpl> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(MetronomeClientImpl);
 };
 
 void MetronomeClientImpl::AddObserver(Observer* observer) {
   DCHECK(observer);
@@ skipping 80 matching lines @@
                                   base::RandInt(-1000, 1000);
     FOR_EACH_OBSERVER(
         Observer, observers_,
         OnTimestampUpdated(fake_beacon_timestamp, fake_local_timestamp));
   }
 
   int64 random_offset_;
   base::RepeatingTimer<MetronomeClientFakeImpl> beacon_timer_;
 
   // List of observers interested in event notifications from us.
-  ObserverList<Observer> observers_;
+  base::ObserverList<Observer> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(MetronomeClientFakeImpl);
 };
 
 ////////////////////////////////////////////////////////////////////////////////
 
 // A stub implementation of MetronomeClient. It allows unit tests to complete.
 class MetronomeClientStubImpl : public MetronomeClient {
  public:
   MetronomeClientStubImpl() {}
@@ skipping 27 matching lines @@
   DCHECK_EQ(STUB_DBUS_CLIENT_IMPLEMENTATION, type);
 
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kTestMetronomeTimer)) {
     return new MetronomeClientFakeImpl();
   }
   return new MetronomeClientStubImpl();
 }
 
 }  // namespace chromeos