Replace more ObserverList with base::ObserverList.

This is everything but the chrome directory
CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel

TBR=zelidrag@chromium.org (chromeos)
TBR=keybuk@chromium.org (device/bluetooth)

Review URL: https://codereview.chromium.org/1162943002

Cr-Commit-Position: refs/heads/master@{#332626}

9 files changed, 9 insertions, 9 deletions

diff --git a/remoting/client/plugin/delegating_signal_strategy.h b/remoting/client/plugin/delegating_signal_strategy.h
index 12fb595..94a3190 100644
--- a/remoting/client/plugin/delegating_signal_strategy.h
+++ b/remoting/client/plugin/delegating_signal_strategy.h
@@ -40,7 +40,7 @@ class DelegatingSignalStrategy : public SignalStrategy {
   std::string local_jid_;
   SendIqCallback send_iq_callback_;
 
-  ObserverList<Listener> listeners_;
+  base::ObserverList<Listener> listeners_;
 
   DISALLOW_COPY_AND_ASSIGN(DelegatingSignalStrategy);
 };
diff --git a/remoting/host/chromoting_host.h b/remoting/host/chromoting_host.h
index a6b1811..e06a9e1 100644
--- a/remoting/host/chromoting_host.h
+++ b/remoting/host/chromoting_host.h
@@ -185,7 +185,7 @@ class ChromotingHost : public base::NonThreadSafe,
   SignalStrategy* signal_strategy_;
 
   // Must be used on the network thread only.
-  ObserverList<HostStatusObserver> status_observers_;
+  base::ObserverList<HostStatusObserver> status_observers_;
 
   // The connections to remote clients.
   ClientList clients_;
diff --git a/remoting/host/daemon_process.h b/remoting/host/daemon_process.h
index 0a7b900..08bf0fd1 100644
--- a/remoting/host/daemon_process.h
+++ b/remoting/host/daemon_process.h
@@ -175,7 +175,7 @@ class DaemonProcess
   int next_terminal_id_;
 
   // Keeps track of observers receiving host status notifications.
-  ObserverList<HostStatusObserver> status_observers_;
+  base::ObserverList<HostStatusObserver> status_observers_;
 
   // Invoked to ask the owner to delete |this|.
   base::Closure stopped_callback_;
diff --git a/remoting/host/linux/audio_pipe_reader.cc b/remoting/host/linux/audio_pipe_reader.cc
index cd293f5..61a290d 100644
--- a/remoting/host/linux/audio_pipe_reader.cc
+++ b/remoting/host/linux/audio_pipe_reader.cc
@@ -48,7 +48,7 @@ AudioPipeReader::AudioPipeReader(
     const base::FilePath& pipe_path)
     : task_runner_(task_runner),
       pipe_path_(pipe_path),
-      observers_(new ObserverListThreadSafe<StreamObserver>()) {
+      observers_(new base::ObserverListThreadSafe<StreamObserver>()) {
 }
 
 AudioPipeReader::~AudioPipeReader() {}
diff --git a/remoting/host/linux/audio_pipe_reader.h b/remoting/host/linux/audio_pipe_reader.h
index 33b9b41..a5b9e4f 100644
--- a/remoting/host/linux/audio_pipe_reader.h
+++ b/remoting/host/linux/audio_pipe_reader.h
@@ -80,7 +80,7 @@ class AudioPipeReader
 
   base::File pipe_;
   base::RepeatingTimer<AudioPipeReader> timer_;
-  scoped_refptr<ObserverListThreadSafe<StreamObserver> > observers_;
+  scoped_refptr<base::ObserverListThreadSafe<StreamObserver>> observers_;
 
   // Size of the pipe buffer.
   int pipe_buffer_size_;
diff --git a/remoting/host/register_support_host_request_unittest.cc b/remoting/host/register_support_host_request_unittest.cc
index c5bb89d..d42e545 100644
--- a/remoting/host/register_support_host_request_unittest.cc
+++ b/remoting/host/register_support_host_request_unittest.cc
@@ -71,7 +71,7 @@ class RegisterSupportHostRequestTest : public testing::Test {
 
   base::MessageLoop message_loop_;
   MockSignalStrategy signal_strategy_;
-  ObserverList<SignalStrategy::Listener, true> signal_strategy_listeners_;
+  base::ObserverList<SignalStrategy::Listener, true> signal_strategy_listeners_;
   scoped_refptr<RsaKeyPair> key_pair_;
   MockCallback callback_;
 };
diff --git a/remoting/signaling/fake_signal_strategy.h b/remoting/signaling/fake_signal_strategy.h
index 0091ccf9..d0fb99a 100644
--- a/remoting/signaling/fake_signal_strategy.h
+++ b/remoting/signaling/fake_signal_strategy.h
@@ -72,7 +72,7 @@ class FakeSignalStrategy : public SignalStrategy,
 
   std::string jid_;
   PeerCallback peer_callback_;
-  ObserverList<Listener, true> listeners_;
+  base::ObserverList<Listener, true> listeners_;
 
   int last_id_;
 
diff --git a/remoting/signaling/xmpp_signal_strategy.cc b/remoting/signaling/xmpp_signal_strategy.cc
index 693ce19..0a55c34 100644
--- a/remoting/signaling/xmpp_signal_strategy.cc
+++ b/remoting/signaling/xmpp_signal_strategy.cc
@@ -112,7 +112,7 @@ class XmppSignalStrategy::Core : public XmppLoginHandler::Delegate {
 
   Error error_;
 
-  ObserverList<Listener, true> listeners_;
+  base::ObserverList<Listener, true> listeners_;
 
   base::Timer keep_alive_timer_;
 
diff --git a/remoting/test/test_chromoting_client.h b/remoting/test/test_chromoting_client.h
index 69f3967..823fe1a 100644
--- a/remoting/test/test_chromoting_client.h
+++ b/remoting/test/test_chromoting_client.h
@@ -99,7 +99,7 @@ class TestChromotingClient : public ClientUserInterface,
   // List of observers which are notified when remote connection events occur.
   // We specify true below for the 'check_empty' flag so the list will check to
   // see if all observers have been unregistered when it is destroyed.
-  ObserverList<RemoteConnectionObserver, true> connection_observers_;
+  base::ObserverList<RemoteConnectionObserver, true> connection_observers_;
 
   // ConnectionToHost used by TestChromotingClient tests.
   scoped_ptr<protocol::ConnectionToHost> test_connection_to_host_;