Replace more ObserverList with base::ObserverList.

content/browser/appcache/appcache_group.h

 // Copyright (c) 2011 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.
 
 #ifndef CONTENT_BROWSER_APPCACHE_APPCACHE_GROUP_H_
 #define CONTENT_BROWSER_APPCACHE_APPCACHE_GROUP_H_
 
 #include <map>
 #include <vector>
 
@@ skipping 104 matching lines @@
   AppCacheUpdateJob* update_job() { return update_job_; }
   void SetUpdateAppCacheStatus(UpdateAppCacheStatus status);
 
   void NotifyContentBlocked();
 
   const Caches& old_caches() const { return old_caches_; }
 
   // Update cannot be processed at this time. Queue it for a later run.
   void QueueUpdate(AppCacheHost* host, const GURL& new_master_resource);
   void RunQueuedUpdates();
-  static bool FindObserver(const UpdateObserver* find_me,
-                           const ObserverList<UpdateObserver>& observer_list);
+  static bool FindObserver(
+      const UpdateObserver* find_me,
+      const base::ObserverList<UpdateObserver>& observer_list);
   void ScheduleUpdateRestart(int delay_ms);
   void HostDestructionImminent(AppCacheHost* host);
 
   const int64 group_id_;
   const GURL manifest_url_;
   base::Time creation_time_;
   UpdateAppCacheStatus update_status_;
   bool is_obsolete_;
   bool is_being_deleted_;
   std::vector<int64> newly_deletable_response_ids_;
 
   // Old complete app caches.
   Caches old_caches_;
 
   // Newest cache in this group to be complete, aka relevant cache.
   AppCache* newest_complete_cache_;
 
   // Current update job for this group, if any.
   AppCacheUpdateJob* update_job_;
 
   // Central storage object.
   AppCacheStorage* storage_;
 
   // List of objects observing this group.
-  ObserverList<UpdateObserver> observers_;
+  base::ObserverList<UpdateObserver> observers_;
 
   // Updates that have been queued for the next run.
   QueuedUpdates queued_updates_;
-  ObserverList<UpdateObserver> queued_observers_;
+  base::ObserverList<UpdateObserver> queued_observers_;
   base::CancelableClosure restart_update_task_;
   scoped_ptr<HostObserver> host_observer_;
 
   // True if we're in our destructor.
   bool is_in_dtor_;
 
   FRIEND_TEST_ALL_PREFIXES(content::AppCacheGroupTest, StartUpdate);
   FRIEND_TEST_ALL_PREFIXES(content::AppCacheGroupTest, CancelUpdate);
   FRIEND_TEST_ALL_PREFIXES(content::AppCacheGroupTest, QueueUpdate);
   FRIEND_TEST_ALL_PREFIXES(content::AppCacheUpdateJobTest, AlreadyChecking);
   FRIEND_TEST_ALL_PREFIXES(content::AppCacheUpdateJobTest, AlreadyDownloading);
 
   DISALLOW_COPY_AND_ASSIGN(AppCacheGroup);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_APPCACHE_APPCACHE_GROUP_H_