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}

25 files changed, 45 insertions, 39 deletions

diff --git a/net/android/network_change_notifier_android_unittest.cc b/net/android/network_change_notifier_android_unittest.cc
index 30ee4f0..8c63d81 100644
--- a/net/android/network_change_notifier_android_unittest.cc
+++ b/net/android/network_change_notifier_android_unittest.cc
@@ -123,7 +123,8 @@ class BaseNetworkChangeNotifierAndroidTest : public testing::Test {
 
   void SetOnline() {
     delegate_.SetOnline();
-    // Note that this is needed because ObserverListThreadSafe uses PostTask().
+    // Note that this is needed because base::ObserverListThreadSafe uses
+    // PostTask().
     base::MessageLoop::current()->RunUntilIdle();
   }
 
diff --git a/net/android/network_change_notifier_delegate_android.cc b/net/android/network_change_notifier_delegate_android.cc
index f623b14..856acfe 100644
--- a/net/android/network_change_notifier_delegate_android.cc
+++ b/net/android/network_change_notifier_delegate_android.cc
@@ -52,7 +52,7 @@ jdouble GetMaxBandwidthForConnectionSubtype(JNIEnv* env,
 }
 
 NetworkChangeNotifierDelegateAndroid::NetworkChangeNotifierDelegateAndroid()
-    : observers_(new ObserverListThreadSafe<Observer>()) {
+    : observers_(new base::ObserverListThreadSafe<Observer>()) {
   JNIEnv* env = base::android::AttachCurrentThread();
   java_network_change_notifier_.Reset(
       Java_NetworkChangeNotifier_init(
diff --git a/net/android/network_change_notifier_delegate_android.h b/net/android/network_change_notifier_delegate_android.h
index 6668b27..cf8390f 100644
--- a/net/android/network_change_notifier_delegate_android.h
+++ b/net/android/network_change_notifier_delegate_android.h
@@ -83,7 +83,7 @@ class NET_EXPORT_PRIVATE NetworkChangeNotifierDelegateAndroid {
   void SetOffline();
 
   base::ThreadChecker thread_checker_;
-  scoped_refptr<ObserverListThreadSafe<Observer> > observers_;
+  scoped_refptr<base::ObserverListThreadSafe<Observer>> observers_;
   scoped_refptr<base::SingleThreadTaskRunner> jni_task_runner_;
   base::android::ScopedJavaGlobalRef<jobject> java_network_change_notifier_;
   mutable base::Lock connection_lock_;  // Protects the state below.
diff --git a/net/base/network_change_notifier.cc b/net/base/network_change_notifier.cc
index 0a4a1f1..7c49fdd 100644
--- a/net/base/network_change_notifier.cc
+++ b/net/base/network_change_notifier.cc
@@ -796,18 +796,20 @@ void NetworkChangeNotifier::SetTestNotificationsOnly(bool test_only) {
 NetworkChangeNotifier::NetworkChangeNotifier(
     const NetworkChangeCalculatorParams& params
     /*= NetworkChangeCalculatorParams()*/)
-    : ip_address_observer_list_(new ObserverListThreadSafe<IPAddressObserver>(
-          base::ObserverListBase<IPAddressObserver>::NOTIFY_EXISTING_ONLY)),
+    : ip_address_observer_list_(
+          new base::ObserverListThreadSafe<IPAddressObserver>(
+              base::ObserverListBase<IPAddressObserver>::NOTIFY_EXISTING_ONLY)),
       connection_type_observer_list_(
-          new ObserverListThreadSafe<ConnectionTypeObserver>(
+          new base::ObserverListThreadSafe<ConnectionTypeObserver>(
               base::ObserverListBase<
                   ConnectionTypeObserver>::NOTIFY_EXISTING_ONLY)),
-      resolver_state_observer_list_(new ObserverListThreadSafe<DNSObserver>(
-          base::ObserverListBase<DNSObserver>::NOTIFY_EXISTING_ONLY)),
-      network_change_observer_list_(new ObserverListThreadSafe<
+      resolver_state_observer_list_(
+          new base::ObserverListThreadSafe<DNSObserver>(
+              base::ObserverListBase<DNSObserver>::NOTIFY_EXISTING_ONLY)),
+      network_change_observer_list_(new base::ObserverListThreadSafe<
           NetworkChangeObserver>(
           base::ObserverListBase<NetworkChangeObserver>::NOTIFY_EXISTING_ONLY)),
-      max_bandwidth_observer_list_(new ObserverListThreadSafe<
+      max_bandwidth_observer_list_(new base::ObserverListThreadSafe<
           MaxBandwidthObserver>(
           base::ObserverListBase<MaxBandwidthObserver>::NOTIFY_EXISTING_ONLY)),
       network_state_(new NetworkState()),
diff --git a/net/base/network_change_notifier.h b/net/base/network_change_notifier.h
index b2e54f5..df6792f 100644
--- a/net/base/network_change_notifier.h
+++ b/net/base/network_change_notifier.h
@@ -430,15 +430,15 @@ class NET_EXPORT NetworkChangeNotifier {
   void NotifyObserversOfNetworkChangeImpl(ConnectionType type);
   void NotifyObserversOfMaxBandwidthChangeImpl(double max_bandwidth_mbps);
 
-  const scoped_refptr<ObserverListThreadSafe<IPAddressObserver>>
+  const scoped_refptr<base::ObserverListThreadSafe<IPAddressObserver>>
       ip_address_observer_list_;
-  const scoped_refptr<ObserverListThreadSafe<ConnectionTypeObserver>>
+  const scoped_refptr<base::ObserverListThreadSafe<ConnectionTypeObserver>>
       connection_type_observer_list_;
-  const scoped_refptr<ObserverListThreadSafe<DNSObserver>>
+  const scoped_refptr<base::ObserverListThreadSafe<DNSObserver>>
       resolver_state_observer_list_;
-  const scoped_refptr<ObserverListThreadSafe<NetworkChangeObserver>>
+  const scoped_refptr<base::ObserverListThreadSafe<NetworkChangeObserver>>
       network_change_observer_list_;
-  const scoped_refptr<ObserverListThreadSafe<MaxBandwidthObserver>>
+  const scoped_refptr<base::ObserverListThreadSafe<MaxBandwidthObserver>>
       max_bandwidth_observer_list_;
 
   // The current network state. Hosts DnsConfig, exposed via GetDnsConfig.
diff --git a/net/base/sdch_manager.h b/net/base/sdch_manager.h
index 72aca28..366b81f 100644
--- a/net/base/sdch_manager.h
+++ b/net/base/sdch_manager.h
@@ -248,7 +248,7 @@ class NET_EXPORT SdchManager {
   // Assert list is empty on destruction since if there is an observer
   // that hasn't removed itself from the list, that observer probably
   // has a reference to the SdchManager.
-  ObserverList<SdchObserver, true> observers_;
+  base::ObserverList<SdchObserver, true> observers_;
 
   base::ThreadChecker thread_checker_;
 
diff --git a/net/cert/cert_database.h b/net/cert/cert_database.h
index fb28c89..43e715e 100644
--- a/net/cert/cert_database.h
+++ b/net/cert/cert_database.h
@@ -14,7 +14,8 @@
 template <typename T> struct DefaultSingletonTraits;
 
 namespace base {
-template <class ObserverType> class ObserverListThreadSafe;
+template <class ObserverType>
+class ObserverListThreadSafe;
 }
 
 namespace net {
diff --git a/net/cert/cert_database_android.cc b/net/cert/cert_database_android.cc
index 144b9a1..d9b0dfc 100644
--- a/net/cert/cert_database_android.cc
+++ b/net/cert/cert_database_android.cc
@@ -12,7 +12,7 @@
 namespace net {
 
 CertDatabase::CertDatabase()
-    : observer_list_(new ObserverListThreadSafe<Observer>) {
+    : observer_list_(new base::ObserverListThreadSafe<Observer>) {
 }
 
 CertDatabase::~CertDatabase() {}
diff --git a/net/cert/cert_database_ios.cc b/net/cert/cert_database_ios.cc
index f96f22a..87dfd39 100644
--- a/net/cert/cert_database_ios.cc
+++ b/net/cert/cert_database_ios.cc
@@ -11,7 +11,8 @@
 namespace net {
 
 CertDatabase::CertDatabase()
-    : observer_list_(new ObserverListThreadSafe<Observer>) {}
+    : observer_list_(new base::ObserverListThreadSafe<Observer>) {
+}
 
 CertDatabase::~CertDatabase() {}
 
diff --git a/net/cert/cert_database_mac.cc b/net/cert/cert_database_mac.cc
index 3f405f3..c6aad551 100644
--- a/net/cert/cert_database_mac.cc
+++ b/net/cert/cert_database_mac.cc
@@ -119,7 +119,7 @@ void CertDatabase::SetMessageLoopForKeychainEvents() {
 }
 
 CertDatabase::CertDatabase()
-    : observer_list_(new ObserverListThreadSafe<Observer>) {
+    : observer_list_(new base::ObserverListThreadSafe<Observer>) {
 }
 
 CertDatabase::~CertDatabase() {
diff --git a/net/cert/cert_database_nss.cc b/net/cert/cert_database_nss.cc
index 6d66cc1..49d27f2 100644
--- a/net/cert/cert_database_nss.cc
+++ b/net/cert/cert_database_nss.cc
@@ -19,7 +19,7 @@
 namespace net {
 
 CertDatabase::CertDatabase()
-    : observer_list_(new ObserverListThreadSafe<Observer>) {
+    : observer_list_(new base::ObserverListThreadSafe<Observer>) {
   crypto::EnsureNSSInit();
 }
 
diff --git a/net/cert/cert_database_openssl.cc b/net/cert/cert_database_openssl.cc
index a67ac1b..a59c2eb 100644
--- a/net/cert/cert_database_openssl.cc
+++ b/net/cert/cert_database_openssl.cc
@@ -17,7 +17,7 @@
 namespace net {
 
 CertDatabase::CertDatabase()
-    : observer_list_(new ObserverListThreadSafe<Observer>) {
+    : observer_list_(new base::ObserverListThreadSafe<Observer>) {
 }
 
 CertDatabase::~CertDatabase() {}
diff --git a/net/cert/cert_database_win.cc b/net/cert/cert_database_win.cc
index fae3cbf..ef8147b 100644
--- a/net/cert/cert_database_win.cc
+++ b/net/cert/cert_database_win.cc
@@ -16,7 +16,7 @@
 namespace net {
 
 CertDatabase::CertDatabase()
-    : observer_list_(new ObserverListThreadSafe<Observer>) {
+    : observer_list_(new base::ObserverListThreadSafe<Observer>) {
 }
 
 CertDatabase::~CertDatabase() {}
diff --git a/net/cert/nss_cert_database.cc b/net/cert/nss_cert_database.cc
index 8aaf759..c9f0133 100644
--- a/net/cert/nss_cert_database.cc
+++ b/net/cert/nss_cert_database.cc
@@ -82,7 +82,7 @@ NSSCertDatabase::NSSCertDatabase(crypto::ScopedPK11Slot public_slot,
                                  crypto::ScopedPK11Slot private_slot)
     : public_slot_(public_slot.Pass()),
       private_slot_(private_slot.Pass()),
-      observer_list_(new ObserverListThreadSafe<Observer>),
+      observer_list_(new base::ObserverListThreadSafe<Observer>),
       weak_factory_(this) {
   CHECK(public_slot_);
 
diff --git a/net/dns/mdns_client_impl.cc b/net/dns/mdns_client_impl.cc
index b4cae7c..2fe89b1 100644
--- a/net/dns/mdns_client_impl.cc
+++ b/net/dns/mdns_client_impl.cc
@@ -341,14 +341,15 @@ void MDnsClientImpl::Core::AddListener(
     MDnsListenerImpl* listener) {
   ListenerKey key(listener->GetName(), listener->GetType());
   std::pair<ListenerMap::iterator, bool> observer_insert_result =
-      listeners_.insert(
-          make_pair(key, static_cast<ObserverList<MDnsListenerImpl>*>(NULL)));
+      listeners_.insert(make_pair(
+          key, static_cast<base::ObserverList<MDnsListenerImpl>*>(NULL)));
 
   // If an equivalent key does not exist, actually create the observer list.
   if (observer_insert_result.second)
-    observer_insert_result.first->second = new ObserverList<MDnsListenerImpl>();
+    observer_insert_result.first->second =
+        new base::ObserverList<MDnsListenerImpl>();
 
-  ObserverList<MDnsListenerImpl>* observer_list =
+  base::ObserverList<MDnsListenerImpl>* observer_list =
       observer_insert_result.first->second;
 
   observer_list->AddObserver(listener);
diff --git a/net/dns/mdns_client_impl.h b/net/dns/mdns_client_impl.h
index a0c5b98..e788601 100644
--- a/net/dns/mdns_client_impl.h
+++ b/net/dns/mdns_client_impl.h
@@ -141,8 +141,8 @@ class NET_EXPORT_PRIVATE MDnsClientImpl : public MDnsClient {
     FRIEND_TEST_ALL_PREFIXES(MDnsTest, CacheCleanupWithShortTTL);
 
     typedef std::pair<std::string, uint16> ListenerKey;
-    typedef std::map<ListenerKey, ObserverList<MDnsListenerImpl>* >
-    ListenerMap;
+    typedef std::map<ListenerKey, base::ObserverList<MDnsListenerImpl>*>
+        ListenerMap;
 
     // Alert listeners of an update to the cache.
     void AlertListeners(MDnsCache::UpdateType update_type,
diff --git a/net/log/net_log.h b/net/log/net_log.h
index 6463c77..7104022 100644
--- a/net/log/net_log.h
+++ b/net/log/net_log.h
@@ -312,7 +312,7 @@ class NET_EXPORT NetLog {
   base::subtle::Atomic32 is_capturing_;
 
   // |lock_| must be acquired whenever reading or writing to this.
-  ObserverList<ThreadSafeObserver, true> observers_;
+  base::ObserverList<ThreadSafeObserver, true> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(NetLog);
 };
diff --git a/net/proxy/polling_proxy_config_service.cc b/net/proxy/polling_proxy_config_service.cc
index 089ef39..4044e1b 100644
--- a/net/proxy/polling_proxy_config_service.cc
+++ b/net/proxy/polling_proxy_config_service.cc
@@ -145,7 +145,7 @@ class PollingProxyConfigService::Core
   }
 
   GetConfigFunction get_config_func_;
-  ObserverList<Observer> observers_;
+  base::ObserverList<Observer> observers_;
   ProxyConfig last_config_;
   base::TimeTicks last_poll_time_;
   base::TimeDelta poll_interval_;
diff --git a/net/proxy/proxy_config_service_android.cc b/net/proxy/proxy_config_service_android.cc
index c3b34d9..66065fb 100644
--- a/net/proxy/proxy_config_service_android.cc
+++ b/net/proxy/proxy_config_service_android.cc
@@ -355,7 +355,7 @@ class ProxyConfigServiceAndroid::Delegate
   ScopedJavaGlobalRef<jobject> java_proxy_change_listener_;
 
   JNIDelegateImpl jni_delegate_;
-  ObserverList<Observer> observers_;
+  base::ObserverList<Observer> observers_;
   scoped_refptr<base::SequencedTaskRunner> network_task_runner_;
   scoped_refptr<base::SequencedTaskRunner> jni_task_runner_;
   GetPropertyCallback get_property_callback_;
diff --git a/net/proxy/proxy_config_service_linux.h b/net/proxy/proxy_config_service_linux.h
index 3d05898..311f81f 100644
--- a/net/proxy/proxy_config_service_linux.h
+++ b/net/proxy/proxy_config_service_linux.h
@@ -266,7 +266,7 @@ class NET_EXPORT_PRIVATE ProxyConfigServiceLinux : public ProxyConfigService {
     // the thread running this loop.
     scoped_refptr<base::SingleThreadTaskRunner> io_task_runner_;
 
-    ObserverList<Observer> observers_;
+    base::ObserverList<Observer> observers_;
 
     DISALLOW_COPY_AND_ASSIGN(Delegate);
   };
diff --git a/net/proxy/proxy_config_service_mac.h b/net/proxy/proxy_config_service_mac.h
index 87c8162..01a0e26 100644
--- a/net/proxy/proxy_config_service_mac.h
+++ b/net/proxy/proxy_config_service_mac.h
@@ -65,7 +65,7 @@ class ProxyConfigServiceMac : public ProxyConfigService {
   Forwarder forwarder_;
   scoped_ptr<const NetworkConfigWatcherMac> config_watcher_;
 
-  ObserverList<Observer> observers_;
+  base::ObserverList<Observer> observers_;
 
   // Holds the last system proxy settings that we fetched.
   bool has_fetched_config_;
diff --git a/net/proxy/proxy_service_unittest.cc b/net/proxy/proxy_service_unittest.cc
index 550365b..6d6c747 100644
--- a/net/proxy/proxy_service_unittest.cc
+++ b/net/proxy/proxy_service_unittest.cc
@@ -156,7 +156,7 @@ class MockProxyConfigService: public ProxyConfigService {
  private:
   ConfigAvailability availability_;
   ProxyConfig config_;
-  ObserverList<Observer, true> observers_;
+  base::ObserverList<Observer, true> observers_;
 };
 
 // A test network delegate that exercises the OnResolveProxy callback.
diff --git a/net/ssl/ssl_config_service.cc b/net/ssl/ssl_config_service.cc
index 5b57cc2..b3237a4 100644
--- a/net/ssl/ssl_config_service.cc
+++ b/net/ssl/ssl_config_service.cc
@@ -11,7 +11,7 @@
 namespace net {
 
 SSLConfigService::SSLConfigService()
-    : observer_list_(ObserverList<Observer>::NOTIFY_EXISTING_ONLY) {
+    : observer_list_(base::ObserverList<Observer>::NOTIFY_EXISTING_ONLY) {
 }
 
 // GlobalSSLObject holds a reference to a global SSL object, such as the
diff --git a/net/ssl/ssl_config_service.h b/net/ssl/ssl_config_service.h
index dd3236d..494614e 100644
--- a/net/ssl/ssl_config_service.h
+++ b/net/ssl/ssl_config_service.h
@@ -81,7 +81,7 @@ class NET_EXPORT SSLConfigService
                            const SSLConfig& new_config);
 
  private:
-  ObserverList<Observer> observer_list_;
+  base::ObserverList<Observer> observer_list_;
 };
 
 }  // namespace net
diff --git a/net/url_request/url_request_context_getter.h b/net/url_request/url_request_context_getter.h
index 52cd341..1616f7c 100644
--- a/net/url_request/url_request_context_getter.h
+++ b/net/url_request/url_request_context_getter.h
@@ -68,7 +68,7 @@ class NET_EXPORT URLRequestContextGetter
   // IO happens.
   void OnDestruct() const;
 
-  ObserverList<URLRequestContextGetterObserver> observer_list_;
+  base::ObserverList<URLRequestContextGetterObserver> observer_list_;
 
   DISALLOW_COPY_AND_ASSIGN(URLRequestContextGetter);
 };