Replace more ObserverList with base::ObserverList.

chromeos/dbus/update_engine_client.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/update_engine_client.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 365 matching lines @@
 
   // Called when the status update signal is initially connected.
   void StatusUpdateConnected(const std::string& interface_name,
                              const std::string& signal_name,
                              bool success) {
     LOG_IF(WARNING, !success)
         << "Failed to connect to status updated signal.";
   }
 
   dbus::ObjectProxy* update_engine_proxy_;
-  ObserverList<Observer> observers_;
+  base::ObserverList<Observer> observers_;
   Status last_status_;
 
   // 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<UpdateEngineClientImpl> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(UpdateEngineClientImpl);
 };
 
 // The UpdateEngineClient implementation used on Linux desktop,
@@ skipping 121 matching lines @@
     FOR_EACH_OBSERVER(Observer, observers_, UpdateStatusChanged(last_status_));
     if (last_status_.status != UPDATE_STATUS_IDLE) {
       base::MessageLoop::current()->PostDelayedTask(
           FROM_HERE,
           base::Bind(&UpdateEngineClientFakeImpl::StateTransition,
                      weak_factory_.GetWeakPtr()),
           base::TimeDelta::FromMilliseconds(delay_ms));
     }
   }
 
-  ObserverList<Observer> observers_;
+  base::ObserverList<Observer> observers_;
   Status last_status_;
 
   base::WeakPtrFactory<UpdateEngineClientFakeImpl> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(UpdateEngineClientFakeImpl);
 };
 
 UpdateEngineClient::UpdateEngineClient() {
 }
 
@@ skipping 26 matching lines @@
   auto cix = std::find(kReleaseChannelsList,
                        kReleaseChannelsList + arraysize(kReleaseChannelsList),
                        current_channel);
   auto tix = std::find(kReleaseChannelsList,
                        kReleaseChannelsList + arraysize(kReleaseChannelsList),
                        target_channel);
   return tix > cix;
 }
 
 }  // namespace chromeos