Replace ObserverList->base::ObserverList in chrome

Follow up from https://codereview.chromium.org/1152983004

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

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

151 files changed, 173 insertions, 169 deletions

diff --git a/chrome/browser/android/accessibility/font_size_prefs_android.h b/chrome/browser/android/accessibility/font_size_prefs_android.h
index af8f75d6..c89639e 100644
--- a/chrome/browser/android/accessibility/font_size_prefs_android.h
+++ b/chrome/browser/android/accessibility/font_size_prefs_android.h
@@ -45,7 +45,7 @@ class FontSizePrefsAndroid {
 
   scoped_ptr<PrefChangeRegistrar> pref_change_registrar_;
   PrefService* const pref_service_;
-  ObserverList<Observer> observers_;
+  base::ObserverList<Observer> observers_;
   base::android::ScopedJavaGlobalRef<jobject> java_ref_;
 
   DISALLOW_COPY_AND_ASSIGN(FontSizePrefsAndroid);
diff --git a/chrome/browser/android/bookmarks/partner_bookmarks_shim.cc b/chrome/browser/android/bookmarks/partner_bookmarks_shim.cc
index c113377..5a4d755 100644
--- a/chrome/browser/android/bookmarks/partner_bookmarks_shim.cc
+++ b/chrome/browser/android/bookmarks/partner_bookmarks_shim.cc
@@ -213,8 +213,8 @@ void PartnerBookmarksShim::EnablePartnerBookmarksEditing() {
 
 PartnerBookmarksShim::PartnerBookmarksShim(PrefService* prefs)
     : prefs_(prefs),
-      observers_(
-          ObserverList<PartnerBookmarksShim::Observer>::NOTIFY_EXISTING_ONLY) {
+      observers_(base::ObserverList<
+          PartnerBookmarksShim::Observer>::NOTIFY_EXISTING_ONLY) {
 }
 
 PartnerBookmarksShim::~PartnerBookmarksShim() {
diff --git a/chrome/browser/android/bookmarks/partner_bookmarks_shim.h b/chrome/browser/android/bookmarks/partner_bookmarks_shim.h
index 6acab0e..bc78106 100644
--- a/chrome/browser/android/bookmarks/partner_bookmarks_shim.h
+++ b/chrome/browser/android/bookmarks/partner_bookmarks_shim.h
@@ -135,7 +135,7 @@ class PartnerBookmarksShim : public base::SupportsUserData::Data {
   NodeRenamingMap node_rename_remove_map_;
 
   // The observers.
-  ObserverList<Observer> observers_;
+  base::ObserverList<Observer> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(PartnerBookmarksShim);
 };
diff --git a/chrome/browser/android/thumbnail/thumbnail_cache.h b/chrome/browser/android/thumbnail/thumbnail_cache.h
index 098c190..cf1f21b 100644
--- a/chrome/browser/android/thumbnail/thumbnail_cache.h
+++ b/chrome/browser/android/thumbnail/thumbnail_cache.h
@@ -154,7 +154,7 @@ class ThumbnailCache : ThumbnailDelegate {
 
   ExpiringThumbnailCache cache_;
   ExpiringThumbnailCache approximation_cache_;
-  ObserverList<ThumbnailCacheObserver> observers_;
+  base::ObserverList<ThumbnailCacheObserver> observers_;
   ThumbnailMetaDataMap thumbnail_meta_data_;
   TabIdList read_queue_;
   TabIdList visible_ids_;
diff --git a/chrome/browser/app_controller_mac.h b/chrome/browser/app_controller_mac.h
index 8c69929..9b640f2 100644
--- a/chrome/browser/app_controller_mac.h
+++ b/chrome/browser/app_controller_mac.h
@@ -90,7 +90,7 @@ class WorkAreaWatcherObserver;
   base::TimeTicks reopenTime_;
 
   // Observers that listen to the work area changes.
-  ObserverList<ui::WorkAreaWatcherObserver> workAreaChangeObservers_;
+  base::ObserverList<ui::WorkAreaWatcherObserver> workAreaChangeObservers_;
 
   scoped_ptr<PrefChangeRegistrar> profilePrefRegistrar_;
   PrefChangeRegistrar localPrefRegistrar_;
diff --git a/chrome/browser/autocomplete/shortcuts_backend.h b/chrome/browser/autocomplete/shortcuts_backend.h
index e0621f5..8429034 100644
--- a/chrome/browser/autocomplete/shortcuts_backend.h
+++ b/chrome/browser/autocomplete/shortcuts_backend.h
@@ -141,7 +141,7 @@ class ShortcutsBackend : public RefcountedKeyedService,
 
   Profile* profile_;
   CurrentState current_state_;
-  ObserverList<ShortcutsBackendObserver> observer_list_;
+  base::ObserverList<ShortcutsBackendObserver> observer_list_;
   scoped_refptr<ShortcutsDatabase> db_;
 
   // The |temp_shortcuts_map_| and |temp_guid_map_| used for temporary storage
diff --git a/chrome/browser/background/background_application_list_model.h b/chrome/browser/background/background_application_list_model.h
index 530eec8..0f19cb0 100644
--- a/chrome/browser/background/background_application_list_model.h
+++ b/chrome/browser/background/background_application_list_model.h
@@ -146,7 +146,7 @@ class BackgroundApplicationListModel : public content::NotificationObserver {
 
   ApplicationMap applications_;
   extensions::ExtensionList extensions_;
-  ObserverList<Observer, true> observers_;
+  base::ObserverList<Observer, true> observers_;
   Profile* profile_;
   content::NotificationRegistrar registrar_;
   bool ready_;
diff --git a/chrome/browser/background/background_contents.h b/chrome/browser/background/background_contents.h
index 9d8dbbc..ea284e9 100644
--- a/chrome/browser/background/background_contents.h
+++ b/chrome/browser/background/background_contents.h
@@ -110,7 +110,7 @@ class BackgroundContents : public extensions::DeferredStartRenderHost,
   Profile* profile_;
   scoped_ptr<content::WebContents> web_contents_;
   content::NotificationRegistrar registrar_;
-  ObserverList<extensions::DeferredStartRenderHostObserver>
+  base::ObserverList<extensions::DeferredStartRenderHostObserver>
       deferred_start_render_host_observer_list_;
 
   // The initial URL to load.
diff --git a/chrome/browser/banners/app_banner_data_fetcher.h b/chrome/browser/banners/app_banner_data_fetcher.h
index fcab912..1f81324 100644
--- a/chrome/browser/banners/app_banner_data_fetcher.h
+++ b/chrome/browser/banners/app_banner_data_fetcher.h
@@ -149,7 +149,7 @@ class AppBannerDataFetcher
 
   const int ideal_icon_size_;
   const base::WeakPtr<Delegate> weak_delegate_;
-  ObserverList<Observer> observer_list_;
+  base::ObserverList<Observer> observer_list_;
   bool is_active_;
   int event_request_id_;
   scoped_ptr<chrome::BitmapFetcher> bitmap_fetcher_;
diff --git a/chrome/browser/browsing_data/browsing_data_remover.h b/chrome/browser/browsing_data/browsing_data_remover.h
index 090b607..62f8281 100644
--- a/chrome/browser/browsing_data/browsing_data_remover.h
+++ b/chrome/browser/browsing_data/browsing_data_remover.h
@@ -426,7 +426,7 @@ class BrowsingDataRemover
   // From which types of origins should we remove data?
   int origin_set_mask_;
 
-  ObserverList<Observer> observer_list_;
+  base::ObserverList<Observer> observer_list_;
 
   // Used if we need to clear history.
   base::CancelableTaskTracker history_task_tracker_;
diff --git a/chrome/browser/browsing_data/cookies_tree_model.h b/chrome/browser/browsing_data/cookies_tree_model.h
index 29af2f5..aa9d100 100644
--- a/chrome/browser/browsing_data/cookies_tree_model.h
+++ b/chrome/browser/browsing_data/cookies_tree_model.h
@@ -801,7 +801,7 @@ class CookiesTreeModel : public ui::TreeNodeModel<CookieTreeNode> {
 
   // The CookiesTreeModel maintains a separate list of observers that are
   // specifically of the type CookiesTreeModel::Observer.
-  ObserverList<Observer> cookies_observer_list_;
+  base::ObserverList<Observer> cookies_observer_list_;
 
   // If true, use the CanonicalCookie::Source attribute to group cookies.
   // Otherwise, use the CanonicalCookie::Domain attribute.
diff --git a/chrome/browser/chromeos/app_mode/kiosk_app_manager.h b/chrome/browser/chromeos/app_mode/kiosk_app_manager.h
index 72d511c..ae7cbab 100644
--- a/chrome/browser/chromeos/app_mode/kiosk_app_manager.h
+++ b/chrome/browser/chromeos/app_mode/kiosk_app_manager.h
@@ -277,7 +277,7 @@ class KioskAppManager : public KioskAppDataDelegate,
   ScopedVector<KioskAppData> apps_;
   std::string auto_launch_app_id_;
   std::string currently_auto_launched_with_zero_delay_app_;
-  ObserverList<KioskAppManagerObserver, true> observers_;
+  base::ObserverList<KioskAppManagerObserver, true> observers_;
 
   scoped_ptr<CrosSettings::ObserverSubscription>
       local_accounts_subscription_;
diff --git a/chrome/browser/chromeos/camera_presence_notifier.h b/chrome/browser/chromeos/camera_presence_notifier.h
index c7b9f2f..5bf089c 100644
--- a/chrome/browser/chromeos/camera_presence_notifier.h
+++ b/chrome/browser/chromeos/camera_presence_notifier.h
@@ -42,7 +42,7 @@ class CameraPresenceNotifier {
   // Timer for camera check cycle.
   base::RepeatingTimer<CameraPresenceNotifier> camera_check_timer_;
 
-  ObserverList<Observer> observers_;
+  base::ObserverList<Observer> observers_;
 
   base::WeakPtrFactory<CameraPresenceNotifier> weak_factory_;
 
diff --git a/chrome/browser/chromeos/device/input_service_proxy.h b/chrome/browser/chromeos/device/input_service_proxy.h
index b359e52..faf7bb1 100644
--- a/chrome/browser/chromeos/device/input_service_proxy.h
+++ b/chrome/browser/chromeos/device/input_service_proxy.h
@@ -57,7 +57,7 @@ class InputServiceProxy {
   void OnDeviceAdded(const device::InputServiceLinux::InputDeviceInfo& info);
   void OnDeviceRemoved(const std::string& id);
 
-  ObserverList<Observer> observers_;
+  base::ObserverList<Observer> observers_;
   scoped_ptr<ServiceObserver> service_observer_;
 
   base::ThreadChecker thread_checker_;
diff --git a/chrome/browser/chromeos/drive/change_list_loader.h b/chrome/browser/chromeos/drive/change_list_loader.h
index 7bdac52..644e6ed 100644
--- a/chrome/browser/chromeos/drive/change_list_loader.h
+++ b/chrome/browser/chromeos/drive/change_list_loader.h
@@ -219,7 +219,7 @@ class ChangeListLoader {
   JobScheduler* scheduler_;  // Not owned.
   AboutResourceLoader* about_resource_loader_;  // Not owned.
   LoaderController* loader_controller_;  // Not owned.
-  ObserverList<ChangeListLoaderObserver> observers_;
+  base::ObserverList<ChangeListLoaderObserver> observers_;
   std::vector<FileOperationCallback> pending_load_callback_;
   FileOperationCallback pending_update_check_callback_;
 
diff --git a/chrome/browser/chromeos/drive/directory_loader.h b/chrome/browser/chromeos/drive/directory_loader.h
index 775d2e1..12a5b8c 100644
--- a/chrome/browser/chromeos/drive/directory_loader.h
+++ b/chrome/browser/chromeos/drive/directory_loader.h
@@ -128,7 +128,7 @@ class DirectoryLoader {
   JobScheduler* scheduler_;  // Not owned.
   AboutResourceLoader* about_resource_loader_;  // Not owned.
   LoaderController* loader_controller_;  // Not owned.
-  ObserverList<ChangeListLoaderObserver> observers_;
+  base::ObserverList<ChangeListLoaderObserver> observers_;
   typedef std::map<std::string, std::vector<ReadDirectoryCallbackState> >
       LoadCallbackMap;
   LoadCallbackMap pending_load_callback_;
diff --git a/chrome/browser/chromeos/drive/drive_integration_service.h b/chrome/browser/chromeos/drive/drive_integration_service.h
index 3ba7c3d..b60b0ad 100644
--- a/chrome/browser/chromeos/drive/drive_integration_service.h
+++ b/chrome/browser/chromeos/drive/drive_integration_service.h
@@ -180,7 +180,7 @@ class DriveIntegrationService : public KeyedService,
   scoped_ptr<DownloadHandler> download_handler_;
   scoped_ptr<DebugInfoCollector> debug_info_collector_;
 
-  ObserverList<DriveIntegrationServiceObserver> observers_;
+  base::ObserverList<DriveIntegrationServiceObserver> observers_;
   scoped_ptr<PreferenceWatcher> preference_watcher_;
   scoped_ptr<content::NotificationRegistrar> profile_notification_registrar_;
 
diff --git a/chrome/browser/chromeos/drive/file_system.h b/chrome/browser/chromeos/drive/file_system.h
index 8ff6a63..6836222 100644
--- a/chrome/browser/chromeos/drive/file_system.h
+++ b/chrome/browser/chromeos/drive/file_system.h
@@ -271,7 +271,7 @@ class FileSystem : public FileSystemInterface,
 
   scoped_ptr<internal::SyncClient> sync_client_;
 
-  ObserverList<FileSystemObserver> observers_;
+  base::ObserverList<FileSystemObserver> observers_;
 
   scoped_refptr<base::SequencedTaskRunner> blocking_task_runner_;
 
diff --git a/chrome/browser/chromeos/drive/job_scheduler.h b/chrome/browser/chromeos/drive/job_scheduler.h
index 40a2d61..1d0eae3 100644
--- a/chrome/browser/chromeos/drive/job_scheduler.h
+++ b/chrome/browser/chromeos/drive/job_scheduler.h
@@ -386,7 +386,7 @@ class JobScheduler
   JobIDMap job_map_;
 
   // The list of observers for the scheduler.
-  ObserverList<JobListObserver> observer_list_;
+  base::ObserverList<JobListObserver> observer_list_;
 
   EventLogger* logger_;
   DriveServiceInterface* drive_service_;
diff --git a/chrome/browser/chromeos/file_manager/fake_disk_mount_manager.h b/chrome/browser/chromeos/file_manager/fake_disk_mount_manager.h
index feff735..0c9cd88 100644
--- a/chrome/browser/chromeos/file_manager/fake_disk_mount_manager.h
+++ b/chrome/browser/chromeos/file_manager/fake_disk_mount_manager.h
@@ -74,7 +74,7 @@ class FakeDiskMountManager : public chromeos::disks::DiskMountManager {
   void InvokeDiskEventForTest(DiskEvent event, const Disk* disk);
 
  private:
-  ObserverList<Observer> observers_;
+  base::ObserverList<Observer> observers_;
 
   DiskMap disks_;
   MountPointMap mount_points_;
diff --git a/chrome/browser/chromeos/file_manager/volume_manager.h b/chrome/browser/chromeos/file_manager/volume_manager.h
index 2e19149..97b8c7b 100644
--- a/chrome/browser/chromeos/file_manager/volume_manager.h
+++ b/chrome/browser/chromeos/file_manager/volume_manager.h
@@ -294,7 +294,7 @@ class VolumeManager : public KeyedService,
   drive::DriveIntegrationService* drive_integration_service_;  // Not owned.
   chromeos::disks::DiskMountManager* disk_mount_manager_;      // Not owned.
   PrefChangeRegistrar pref_change_registrar_;
-  ObserverList<VolumeManagerObserver> observers_;
+  base::ObserverList<VolumeManagerObserver> observers_;
   chromeos::file_system_provider::Service*
       file_system_provider_service_;  // Not owned by this class.
   std::map<std::string, linked_ptr<Volume>> mounted_volumes_;
diff --git a/chrome/browser/chromeos/file_system_provider/fake_provided_file_system.h b/chrome/browser/chromeos/file_system_provider/fake_provided_file_system.h
index 197a439..b3aedcb 100644
--- a/chrome/browser/chromeos/file_system_provider/fake_provided_file_system.h
+++ b/chrome/browser/chromeos/file_system_provider/fake_provided_file_system.h
@@ -185,7 +185,7 @@ class FakeProvidedFileSystem : public ProvidedFileSystemInterface {
   OpenedFiles opened_files_;
   int last_file_handle_;
   base::CancelableTaskTracker tracker_;
-  ObserverList<ProvidedFileSystemObserver> observers_;
+  base::ObserverList<ProvidedFileSystemObserver> observers_;
   Watchers watchers_;
 
   base::WeakPtrFactory<FakeProvidedFileSystem> weak_ptr_factory_;
diff --git a/chrome/browser/chromeos/file_system_provider/provided_file_system.h b/chrome/browser/chromeos/file_system_provider/provided_file_system.h
index 2cdf6db..3bde99a 100644
--- a/chrome/browser/chromeos/file_system_provider/provided_file_system.h
+++ b/chrome/browser/chromeos/file_system_provider/provided_file_system.h
@@ -240,7 +240,7 @@ class ProvidedFileSystem : public ProvidedFileSystemInterface {
   Watchers watchers_;
   Queue watcher_queue_;
   OpenedFiles opened_files_;
-  ObserverList<ProvidedFileSystemObserver> observers_;
+  base::ObserverList<ProvidedFileSystemObserver> observers_;
 
   base::WeakPtrFactory<ProvidedFileSystem> weak_ptr_factory_;
   DISALLOW_COPY_AND_ASSIGN(ProvidedFileSystem);
diff --git a/chrome/browser/chromeos/file_system_provider/request_manager.h b/chrome/browser/chromeos/file_system_provider/request_manager.h
index 704c2a0..61d20af 100644
--- a/chrome/browser/chromeos/file_system_provider/request_manager.h
+++ b/chrome/browser/chromeos/file_system_provider/request_manager.h
@@ -186,7 +186,7 @@ class RequestManager {
   NotificationManagerInterface* notification_manager_;  // Not owned.
   int next_id_;
   base::TimeDelta timeout_;
-  ObserverList<Observer> observers_;
+  base::ObserverList<Observer> observers_;
   base::WeakPtrFactory<RequestManager> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(RequestManager);
diff --git a/chrome/browser/chromeos/file_system_provider/service.h b/chrome/browser/chromeos/file_system_provider/service.h
index d072bd9..bded1e1 100644
--- a/chrome/browser/chromeos/file_system_provider/service.h
+++ b/chrome/browser/chromeos/file_system_provider/service.h
@@ -204,7 +204,7 @@ class Service : public KeyedService,
   Profile* profile_;
   extensions::ExtensionRegistry* extension_registry_;  // Not owned.
   FileSystemFactoryCallback file_system_factory_;
-  ObserverList<Observer> observers_;
+  base::ObserverList<Observer> observers_;
   ProvidedFileSystemMap file_system_map_;  // Owns pointers.
   MountPointNameToKeyMap mount_point_name_to_key_map_;
   scoped_ptr<RegistryInterface> registry_;
diff --git a/chrome/browser/chromeos/first_run/drive_first_run_controller.h b/chrome/browser/chromeos/first_run/drive_first_run_controller.h
index 44052ba..e062694 100644
--- a/chrome/browser/chromeos/first_run/drive_first_run_controller.h
+++ b/chrome/browser/chromeos/first_run/drive_first_run_controller.h
@@ -81,7 +81,7 @@ class DriveFirstRunController {
   base::OneShotTimer<DriveFirstRunController> web_contents_timer_;
   base::OneShotTimer<DriveFirstRunController> initial_delay_timer_;
   bool started_;
-  ObserverList<Observer> observer_list_;
+  base::ObserverList<Observer> observer_list_;
 
   int initial_delay_secs_;
   int web_contents_timeout_secs_;
diff --git a/chrome/browser/chromeos/input_method/candidate_window_controller_impl.h b/chrome/browser/chromeos/input_method/candidate_window_controller_impl.h
index bce59ae..0c2fc5e 100644
--- a/chrome/browser/chromeos/input_method/candidate_window_controller_impl.h
+++ b/chrome/browser/chromeos/input_method/candidate_window_controller_impl.h
@@ -89,7 +89,7 @@ class CandidateWindowControllerImpl
   // Infolist window.
   std::vector<ui::InfolistEntry> latest_infolist_entries_;
 
-  ObserverList<CandidateWindowController::Observer> observers_;
+  base::ObserverList<CandidateWindowController::Observer> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(CandidateWindowControllerImpl);
 };
diff --git a/chrome/browser/chromeos/input_method/input_method_manager_impl.h b/chrome/browser/chromeos/input_method/input_method_manager_impl.h
index 89cbc65..3c5b7ef 100644
--- a/chrome/browser/chromeos/input_method/input_method_manager_impl.h
+++ b/chrome/browser/chromeos/input_method/input_method_manager_impl.h
@@ -229,8 +229,8 @@ class InputMethodManagerImpl : public InputMethodManager,
   UISessionState ui_session_;
 
   // A list of objects that monitor the manager.
-  ObserverList<InputMethodManager::Observer> observers_;
-  ObserverList<CandidateWindowObserver> candidate_window_observers_;
+  base::ObserverList<InputMethodManager::Observer> observers_;
+  base::ObserverList<CandidateWindowObserver> candidate_window_observers_;
 
   scoped_refptr<StateImpl> state_;
 
diff --git a/chrome/browser/chromeos/input_method/mock_candidate_window_controller.h b/chrome/browser/chromeos/input_method/mock_candidate_window_controller.h
index 37546b2..4a6b114 100644
--- a/chrome/browser/chromeos/input_method/mock_candidate_window_controller.h
+++ b/chrome/browser/chromeos/input_method/mock_candidate_window_controller.h
@@ -32,7 +32,7 @@ class MockCandidateWindowController : public CandidateWindowController {
   int hide_count_;
 
  private:
-  ObserverList<CandidateWindowController::Observer> observers_;
+  base::ObserverList<CandidateWindowController::Observer> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(MockCandidateWindowController);
 };
diff --git a/chrome/browser/chromeos/login/screens/network_screen.h b/chrome/browser/chromeos/login/screens/network_screen.h
index 740b0f7..d5c96bc 100644
--- a/chrome/browser/chromeos/login/screens/network_screen.h
+++ b/chrome/browser/chromeos/login/screens/network_screen.h
@@ -181,7 +181,7 @@ class NetworkScreen : public NetworkModel,
   // The exact language code selected by user in the menu.
   std::string selected_language_code_;
 
-  ObserverList<Observer> observers_;
+  base::ObserverList<Observer> observers_;
 
   base::WeakPtrFactory<NetworkScreen> weak_factory_;
 
diff --git a/chrome/browser/chromeos/login/session/user_session_manager.h b/chrome/browser/chromeos/login/session/user_session_manager.h
index b1e7466..819bb33 100644
--- a/chrome/browser/chromeos/login/session/user_session_manager.h
+++ b/chrome/browser/chromeos/login/session/user_session_manager.h
@@ -429,7 +429,8 @@ class UserSessionManager
   // [user_id] > [user_id_hash]
   SessionManagerClient::ActiveSessionsMap pending_user_sessions_;
 
-  ObserverList<chromeos::UserSessionStateObserver> session_state_observer_list_;
+  base::ObserverList<chromeos::UserSessionStateObserver>
+      session_state_observer_list_;
 
   // OAuth2 session related members.
 
diff --git a/chrome/browser/chromeos/login/signin/oauth2_login_manager.h b/chrome/browser/chromeos/login/signin/oauth2_login_manager.h
index bac1bcb..ba774c4 100644
--- a/chrome/browser/chromeos/login/signin/oauth2_login_manager.h
+++ b/chrome/browser/chromeos/login/signin/oauth2_login_manager.h
@@ -247,8 +247,8 @@ class OAuth2LoginManager : public KeyedService,
   // List of observers to notify when token availability changes.
   // Makes sure list is empty on destruction.
   // TODO(zelidrag|gspencer): Figure out how to get rid of ProfileHelper so we
-  // can change the line below to ObserverList<Observer, true>.
-  ObserverList<Observer, false> observer_list_;
+  // can change the line below to base::ObserverList<Observer, true>.
+  base::ObserverList<Observer, false> observer_list_;
 
   DISALLOW_COPY_AND_ASSIGN(OAuth2LoginManager);
 };
diff --git a/chrome/browser/chromeos/login/ui/user_adding_screen.cc b/chrome/browser/chromeos/login/ui/user_adding_screen.cc
index 729a547..46cd6e8 100644
--- a/chrome/browser/chromeos/login/ui/user_adding_screen.cc
+++ b/chrome/browser/chromeos/login/ui/user_adding_screen.cc
@@ -41,7 +41,7 @@ class UserAddingScreenImpl : public UserAddingScreen {
   UserAddingScreenImpl();
   ~UserAddingScreenImpl() override;
 
-  ObserverList<Observer> observers_;
+  base::ObserverList<Observer> observers_;
   LoginDisplayHost* display_host_;
 
   UserAddingScreenInputMethodsController im_controller_;
diff --git a/chrome/browser/chromeos/login/ui/webui_login_view.h b/chrome/browser/chromeos/login/ui/webui_login_view.h
index c11164e..1425db7 100644
--- a/chrome/browser/chromeos/login/ui/webui_login_view.h
+++ b/chrome/browser/chromeos/login/ui/webui_login_view.h
@@ -184,8 +184,8 @@ class WebUILoginView : public views::View,
   // True to forward keyboard event.
   bool forward_keyboard_event_;
 
-  ObserverList<web_modal::ModalDialogHostObserver> observer_list_;
-  ObserverList<FrameObserver> frame_observer_list_;
+  base::ObserverList<web_modal::ModalDialogHostObserver> observer_list_;
+  base::ObserverList<FrameObserver> frame_observer_list_;
 
   // Manage popups appearing over the login window.
   // TODO(gbillock): See if we can get rid of this. Perhaps in favor of
diff --git a/chrome/browser/chromeos/login/users/avatar/user_image_sync_observer.h b/chrome/browser/chromeos/login/users/avatar/user_image_sync_observer.h
index 85d3901..1b34439 100644
--- a/chrome/browser/chromeos/login/users/avatar/user_image_sync_observer.h
+++ b/chrome/browser/chromeos/login/users/avatar/user_image_sync_observer.h
@@ -96,7 +96,7 @@ class UserImageSyncObserver: public PrefServiceSyncableObserver,
   bool is_synced_;
   // Indicates if local user image changed during initialization.
   bool local_image_changed_;
-  ObserverList<Observer> observer_list_;
+  base::ObserverList<Observer> observer_list_;
 };
 
 }  // namespace chromeos
diff --git a/chrome/browser/chromeos/login/wizard_controller.h b/chrome/browser/chromeos/login/wizard_controller.h
index 87e79cf..2a84f43 100644
--- a/chrome/browser/chromeos/login/wizard_controller.h
+++ b/chrome/browser/chromeos/login/wizard_controller.h
@@ -380,7 +380,7 @@ class WizardController : public BaseScreenDelegate,
   // user Sign-In completed.
   base::Time time_oobe_started_;
 
-  ObserverList<Observer> observer_list_;
+  base::ObserverList<Observer> observer_list_;
 
   bool login_screen_started_;
 
diff --git a/chrome/browser/chromeos/mobile/mobile_activator.h b/chrome/browser/chromeos/mobile/mobile_activator.h
index 9e795ab..ac6d6de6 100644
--- a/chrome/browser/chromeos/mobile/mobile_activator.h
+++ b/chrome/browser/chromeos/mobile/mobile_activator.h
@@ -318,7 +318,7 @@ class MobileActivator
   // Cellular plan payment time.
   base::Time cellular_plan_payment_time_;
 
-  ObserverList<Observer> observers_;
+  base::ObserverList<Observer> observers_;
   base::WeakPtrFactory<MobileActivator> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(MobileActivator);
diff --git a/chrome/browser/chromeos/net/network_portal_detector_impl.h b/chrome/browser/chromeos/net/network_portal_detector_impl.h
index e626041..a933ca6 100644
--- a/chrome/browser/chromeos/net/network_portal_detector_impl.h
+++ b/chrome/browser/chromeos/net/network_portal_detector_impl.h
@@ -222,7 +222,7 @@ class NetworkPortalDetectorImpl
 
   State state_;
   CaptivePortalStateMap portal_state_map_;
-  ObserverList<Observer> observers_;
+  base::ObserverList<Observer> observers_;
 
   base::CancelableClosure attempt_task_;
   base::CancelableClosure attempt_timeout_;
diff --git a/chrome/browser/chromeos/net/network_portal_detector_test_impl.h b/chrome/browser/chromeos/net/network_portal_detector_test_impl.h
index 70ecf1c..e94d374 100644
--- a/chrome/browser/chromeos/net/network_portal_detector_test_impl.h
+++ b/chrome/browser/chromeos/net/network_portal_detector_test_impl.h
@@ -47,7 +47,7 @@ class NetworkPortalDetectorTestImpl : public NetworkPortalDetector {
   typedef std::string NetworkId;
   typedef base::hash_map<NetworkId, CaptivePortalState> CaptivePortalStateMap;
 
-  ObserverList<Observer> observers_;
+  base::ObserverList<Observer> observers_;
   scoped_ptr<NetworkState> default_network_;
   CaptivePortalStateMap portal_state_map_;
   PortalDetectorStrategy::StrategyId strategy_id_;
diff --git a/chrome/browser/chromeos/options/cert_library.h b/chrome/browser/chromeos/options/cert_library.h
index 8399dd1..99fc56b 100644
--- a/chrome/browser/chromeos/options/cert_library.h
+++ b/chrome/browser/chromeos/options/cert_library.h
@@ -89,7 +89,7 @@ class CertLibrary : public CertLoader::Observer {
   net::X509Certificate* GetCertificateAt(CertType type, int index) const;
   const net::CertificateList& GetCertificateListForType(CertType type) const;
 
-  ObserverList<CertLibrary::Observer> observer_list_;
+  base::ObserverList<CertLibrary::Observer> observer_list_;
 
   // Sorted certificate lists
   net::CertificateList certs_;
diff --git a/chrome/browser/chromeos/policy/affiliated_invalidation_service_provider_impl.h b/chrome/browser/chromeos/policy/affiliated_invalidation_service_provider_impl.h
index 1ab8216..d69d11b 100644
--- a/chrome/browser/chromeos/policy/affiliated_invalidation_service_provider_impl.h
+++ b/chrome/browser/chromeos/policy/affiliated_invalidation_service_provider_impl.h
@@ -85,7 +85,7 @@ class AffiliatedInvalidationServiceProviderImpl
   // for use.
   invalidation::InvalidationService* invalidation_service_;
 
-  ObserverList<Consumer, true> consumers_;
+  base::ObserverList<Consumer, true> consumers_;
   int consumer_count_;
 
   bool is_shut_down_;
diff --git a/chrome/browser/chromeos/policy/consumer_management_service.h b/chrome/browser/chromeos/policy/consumer_management_service.h
index 34c51e6..848284f 100644
--- a/chrome/browser/chromeos/policy/consumer_management_service.h
+++ b/chrome/browser/chromeos/policy/consumer_management_service.h
@@ -141,7 +141,7 @@ class ConsumerManagementService
   chromeos::CryptohomeClient* client_;
   chromeos::DeviceSettingsService* device_settings_service_;
 
-  ObserverList<Observer, true> observers_;
+  base::ObserverList<Observer, true> observers_;
   base::WeakPtrFactory<ConsumerManagementService> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ConsumerManagementService);
diff --git a/chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h b/chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h
index 33f11a84..a830542 100644
--- a/chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h
+++ b/chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h
@@ -146,7 +146,7 @@ class DeviceCloudPolicyManagerChromeOS : public CloudPolicyManager {
   scoped_ptr<chromeos::attestation::AttestationPolicyObserver>
       attestation_policy_observer_;
 
-  ObserverList<Observer, true> observers_;
+  base::ObserverList<Observer, true> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(DeviceCloudPolicyManagerChromeOS);
 };
diff --git a/chrome/browser/chromeos/policy/device_local_account_policy_service.h b/chrome/browser/chromeos/policy/device_local_account_policy_service.h
index de76639..530f7ce6 100644
--- a/chrome/browser/chromeos/policy/device_local_account_policy_service.h
+++ b/chrome/browser/chromeos/policy/device_local_account_policy_service.h
@@ -231,7 +231,7 @@ class DeviceLocalAccountPolicyService {
   // Notifies the |observers_| that the policy for |user_id| has changed.
   void NotifyPolicyUpdated(const std::string& user_id);
 
-  ObserverList<Observer, true> observers_;
+  base::ObserverList<Observer, true> observers_;
 
   chromeos::SessionManagerClient* session_manager_client_;
   chromeos::DeviceSettingsService* device_settings_service_;
diff --git a/chrome/browser/chromeos/policy/user_network_configuration_updater.h b/chrome/browser/chromeos/policy/user_network_configuration_updater.h
index b5bf150..d3db409 100644
--- a/chrome/browser/chromeos/policy/user_network_configuration_updater.h
+++ b/chrome/browser/chromeos/policy/user_network_configuration_updater.h
@@ -129,7 +129,7 @@ class UserNetworkConfigurationUpdater : public NetworkConfigurationUpdater,
   // The user for whom the user policy will be applied.
   const user_manager::User* user_;
 
-  ObserverList<WebTrustedCertsObserver, true> observer_list_;
+  base::ObserverList<WebTrustedCertsObserver, true> observer_list_;
 
   // Contains the certificates of the last import that requested web trust. Must
   // be empty if Web trust from policy is not allowed.
diff --git a/chrome/browser/chromeos/settings/device_settings_service.h b/chrome/browser/chromeos/settings/device_settings_service.h
index 34c99b7..d15956d 100644
--- a/chrome/browser/chromeos/settings/device_settings_service.h
+++ b/chrome/browser/chromeos/settings/device_settings_service.h
@@ -221,7 +221,7 @@ class DeviceSettingsService : public SessionManagerClient::Observer {
   // currently active; it gets removed and destroyed once it completes.
   std::deque<linked_ptr<SessionManagerOperation>> pending_operations_;
 
-  ObserverList<Observer> observers_;
+  base::ObserverList<Observer> observers_;
 
   // For recoverable load errors how many retries are left before we give up.
   int load_retries_left_;
diff --git a/chrome/browser/chromeos/system/automatic_reboot_manager.h b/chrome/browser/chromeos/system/automatic_reboot_manager.h
index 38b10ee..2dbc98e 100644
--- a/chrome/browser/chromeos/system/automatic_reboot_manager.h
+++ b/chrome/browser/chromeos/system/automatic_reboot_manager.h
@@ -170,7 +170,7 @@ class AutomaticRebootManager : public PowerManagerClient::Observer,
   scoped_ptr<base::OneShotTimer<AutomaticRebootManager> > grace_start_timer_;
   scoped_ptr<base::OneShotTimer<AutomaticRebootManager> > grace_end_timer_;
 
-  ObserverList<AutomaticRebootManagerObserver, true> observers_;
+  base::ObserverList<AutomaticRebootManagerObserver, true> observers_;
 
   base::WeakPtrFactory<AutomaticRebootManager> weak_ptr_factory_;
 
diff --git a/chrome/browser/chromeos/system/device_disabling_manager.h b/chrome/browser/chromeos/system/device_disabling_manager.h
index c72091f..3734632 100644
--- a/chrome/browser/chromeos/system/device_disabling_manager.h
+++ b/chrome/browser/chromeos/system/device_disabling_manager.h
@@ -119,7 +119,7 @@ class DeviceDisablingManager {
   CrosSettings* cros_settings_;
   user_manager::UserManager* user_manager_;
 
-  ObserverList<Observer> observers_;
+  base::ObserverList<Observer> observers_;
 
   scoped_ptr<CrosSettings::ObserverSubscription> device_disabled_subscription_;
   scoped_ptr<CrosSettings::ObserverSubscription> disabled_message_subscription_;
diff --git a/chrome/browser/chromeos/system/pointer_device_observer.h b/chrome/browser/chromeos/system/pointer_device_observer.h
index c813da49..0938a32 100644
--- a/chrome/browser/chromeos/system/pointer_device_observer.h
+++ b/chrome/browser/chromeos/system/pointer_device_observer.h
@@ -48,7 +48,7 @@ class PointerDeviceObserver : public ui::InputDeviceEventObserver {
   void OnTouchpadExists(bool exists);
   void OnMouseExists(bool exists);
 
-  ObserverList<Observer> observers_;
+  base::ObserverList<Observer> observers_;
 
   base::WeakPtrFactory<PointerDeviceObserver> weak_factory_;
 
diff --git a/chrome/browser/command_updater.cc b/chrome/browser/command_updater.cc
index 4eb8391..eae13ce 100644
--- a/chrome/browser/command_updater.cc
+++ b/chrome/browser/command_updater.cc
@@ -15,7 +15,7 @@
 class CommandUpdater::Command {
  public:
   bool enabled;
-  ObserverList<CommandObserver> observers;
+  base::ObserverList<CommandObserver> observers;
 
   Command() : enabled(true) {}
 };
diff --git a/chrome/browser/content_settings/tab_specific_content_settings.h b/chrome/browser/content_settings/tab_specific_content_settings.h
index 0bc6ec6..b951c91 100644
--- a/chrome/browser/content_settings/tab_specific_content_settings.h
+++ b/chrome/browser/content_settings/tab_specific_content_settings.h
@@ -402,7 +402,7 @@ class TabSpecificContentSettings
   void MidiDidNavigate(const content::LoadCommittedDetails& details);
 
   // All currently registered |SiteDataObserver|s.
-  ObserverList<SiteDataObserver> observer_list_;
+  base::ObserverList<SiteDataObserver> observer_list_;
 
   // Stores which content setting types actually have blocked content.
   bool content_blocked_[CONTENT_SETTINGS_NUM_TYPES];
diff --git a/chrome/browser/download/download_history.h b/chrome/browser/download/download_history.h
index 4cb0506..6b3c1cb 100644
--- a/chrome/browser/download/download_history.h
+++ b/chrome/browser/download/download_history.h
@@ -148,7 +148,7 @@ class DownloadHistory : public AllDownloadItemNotifier::Observer {
   // Count the number of items in the history for UMA.
   int64 history_size_;
 
-  ObserverList<Observer> observers_;
+  base::ObserverList<Observer> observers_;
 
   base::WeakPtrFactory<DownloadHistory> weak_ptr_factory_;
 
diff --git a/chrome/browser/drive/drive_api_service.h b/chrome/browser/drive/drive_api_service.h
index 61a6550..564a116 100644
--- a/chrome/browser/drive/drive_api_service.h
+++ b/chrome/browser/drive/drive_api_service.h
@@ -251,7 +251,7 @@ class DriveAPIService : public DriveServiceInterface,
   scoped_refptr<net::URLRequestContextGetter> url_request_context_getter_;
   scoped_refptr<base::SequencedTaskRunner> blocking_task_runner_;
   scoped_ptr<google_apis::RequestSender> sender_;
-  ObserverList<DriveServiceObserver> observers_;
+  base::ObserverList<DriveServiceObserver> observers_;
   google_apis::DriveApiUrlGenerator url_generator_;
   const std::string custom_user_agent_;
 
diff --git a/chrome/browser/drive/drive_app_registry.h b/chrome/browser/drive/drive_app_registry.h
index 1596cd1..1edad1f 100644
--- a/chrome/browser/drive/drive_app_registry.h
+++ b/chrome/browser/drive/drive_app_registry.h
@@ -131,7 +131,7 @@ class DriveAppRegistry {
 
   bool is_updating_;
 
-  ObserverList<DriveAppRegistryObserver> observers_;
+  base::ObserverList<DriveAppRegistryObserver> observers_;
 
   // Note: This should remain the last member so it'll be destroyed and
   // invalidate the weak pointers before any other members are destroyed.
diff --git a/chrome/browser/drive/drive_notification_manager.h b/chrome/browser/drive/drive_notification_manager.h
index e125cde..bd3f6f5 100644
--- a/chrome/browser/drive/drive_notification_manager.h
+++ b/chrome/browser/drive/drive_notification_manager.h
@@ -73,7 +73,7 @@ class DriveNotificationManager : public KeyedService,
   static std::string NotificationSourceToString(NotificationSource source);
 
   invalidation::InvalidationService* invalidation_service_;
-  ObserverList<DriveNotificationObserver> observers_;
+  base::ObserverList<DriveNotificationObserver> observers_;
 
   // True when Drive File Sync Service is registered for Drive notifications.
   bool push_notification_registered_;
diff --git a/chrome/browser/drive/fake_drive_service.h b/chrome/browser/drive/fake_drive_service.h
index 0950963..78cfdeb 100644
--- a/chrome/browser/drive/fake_drive_service.h
+++ b/chrome/browser/drive/fake_drive_service.h
@@ -394,7 +394,7 @@ class FakeDriveService : public DriveServiceInterface {
   std::string app_json_template_;
   std::string open_url_format_;
 
-  ObserverList<ChangeObserver> change_observers_;
+  base::ObserverList<ChangeObserver> change_observers_;
 
   base::WeakPtrFactory<FakeDriveService> weak_ptr_factory_;
 
diff --git a/chrome/browser/extensions/activity_log/activity_log.cc b/chrome/browser/extensions/activity_log/activity_log.cc
index 059fd3e..b03a171 100644
--- a/chrome/browser/extensions/activity_log/activity_log.cc
+++ b/chrome/browser/extensions/activity_log/activity_log.cc
@@ -367,7 +367,7 @@ ActivityLog::ActivityLog(content::BrowserContext* context)
   watchdog_apps_active_ =
       profile_->GetPrefs()->GetInteger(prefs::kWatchdogExtensionActive);
 
-  observers_ = new ObserverListThreadSafe<Observer>;
+  observers_ = new base::ObserverListThreadSafe<Observer>;
 
   // Check that the right threads exist for logging to the database.
   // If not, we shouldn't try to do things that require them.
diff --git a/chrome/browser/extensions/activity_log/activity_log.h b/chrome/browser/extensions/activity_log/activity_log.h
index 82b72af..e7f4025 100644
--- a/chrome/browser/extensions/activity_log/activity_log.h
+++ b/chrome/browser/extensions/activity_log/activity_log.h
@@ -161,7 +161,7 @@ class ActivityLog : public BrowserContextKeyedAPI,
   static const bool kServiceRedirectedInIncognito = true;
   static const bool kServiceIsCreatedWithBrowserContext = false;
 
-  typedef ObserverListThreadSafe<Observer> ObserverList;
+  typedef base::ObserverListThreadSafe<Observer> ObserverList;
   scoped_refptr<ObserverList> observers_;
 
   // Policy objects are owned by the ActivityLog, but cannot be scoped_ptrs
diff --git a/chrome/browser/extensions/api/braille_display_private/braille_controller_brlapi.h b/chrome/browser/extensions/api/braille_display_private/braille_controller_brlapi.h
index db36867..f299e57 100644
--- a/chrome/browser/extensions/api/braille_display_private/braille_controller_brlapi.h
+++ b/chrome/browser/extensions/api/braille_display_private/braille_controller_brlapi.h
@@ -74,7 +74,7 @@ class BrailleControllerImpl : public BrailleController {
   base::Time retry_connect_horizon_;
 
   // Manipulated on the UI thread.
-  ObserverList<BrailleObserver> observers_;
+  base::ObserverList<BrailleObserver> observers_;
 
   // Manipulated on the FILE thread.
   base::FilePathWatcher file_path_watcher_;
diff --git a/chrome/browser/extensions/api/content_settings/content_settings_store.h b/chrome/browser/extensions/api/content_settings/content_settings_store.h
index fc4fa77..33aa972 100644
--- a/chrome/browser/extensions/api/content_settings/content_settings_store.h
+++ b/chrome/browser/extensions/api/content_settings/content_settings_store.h
@@ -133,7 +133,7 @@ class ContentSettingsStore
 
   ExtensionEntryMap entries_;
 
-  ObserverList<Observer, false> observers_;
+  base::ObserverList<Observer, false> observers_;
 
   mutable base::Lock lock_;
 
diff --git a/chrome/browser/extensions/api/dial/dial_service.h b/chrome/browser/extensions/api/dial/dial_service.h
index e337ca7..23ef579 100644
--- a/chrome/browser/extensions/api/dial/dial_service.h
+++ b/chrome/browser/extensions/api/dial/dial_service.h
@@ -282,7 +282,7 @@ class DialServiceImpl : public DialService,
   base::TimeDelta request_interval_;
 
   // List of observers.
-  ObserverList<Observer> observer_list_;
+  base::ObserverList<Observer> observer_list_;
 
   // Thread checker.
   base::ThreadChecker thread_checker_;
diff --git a/chrome/browser/extensions/api/extension_action/extension_action_api.h b/chrome/browser/extensions/api/extension_action/extension_action_api.h
index 63dccbd..61ab75b 100644
--- a/chrome/browser/extensions/api/extension_action/extension_action_api.h
+++ b/chrome/browser/extensions/api/extension_action/extension_action_api.h
@@ -138,7 +138,7 @@ class ExtensionActionAPI : public BrowserContextKeyedAPI {
   static const char* service_name() { return "ExtensionActionAPI"; }
   static const bool kServiceRedirectedInIncognito = true;
 
-  ObserverList<Observer> observers_;
+  base::ObserverList<Observer> observers_;
 
   content::BrowserContext* browser_context_;
 
diff --git a/chrome/browser/extensions/api/identity/identity_api.h b/chrome/browser/extensions/api/identity/identity_api.h
index c60563a..f2a0879 100644
--- a/chrome/browser/extensions/api/identity/identity_api.h
+++ b/chrome/browser/extensions/api/identity/identity_api.h
@@ -139,7 +139,7 @@ class IdentityAPI : public BrowserContextKeyedAPI,
   CachedTokens token_cache_;
   ProfileIdentityProvider profile_identity_provider_;
   gaia::AccountTracker account_tracker_;
-  ObserverList<ShutdownObserver> shutdown_observer_list_;
+  base::ObserverList<ShutdownObserver> shutdown_observer_list_;
 };
 
 template <>
diff --git a/chrome/browser/extensions/api/mdns/dns_sd_registry.h b/chrome/browser/extensions/api/mdns/dns_sd_registry.h
index c85b1fc..2a97194 100644
--- a/chrome/browser/extensions/api/mdns/dns_sd_registry.h
+++ b/chrome/browser/extensions/api/mdns/dns_sd_registry.h
@@ -104,7 +104,7 @@ class DnsSdRegistry : public DnsSdDelegate {
 
   scoped_refptr<local_discovery::ServiceDiscoverySharedClient>
       service_discovery_client_;
-  ObserverList<DnsSdObserver> observers_;
+  base::ObserverList<DnsSdObserver> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(DnsSdRegistry);
 };
diff --git a/chrome/browser/extensions/api/storage/syncable_settings_storage.cc b/chrome/browser/extensions/api/storage/syncable_settings_storage.cc
index 71db3f5..b30292e 100644
--- a/chrome/browser/extensions/api/storage/syncable_settings_storage.cc
+++ b/chrome/browser/extensions/api/storage/syncable_settings_storage.cc
@@ -17,7 +17,7 @@ using content::BrowserThread;
 namespace extensions {
 
 SyncableSettingsStorage::SyncableSettingsStorage(
-    const scoped_refptr<ObserverListThreadSafe<SettingsObserver> >&
+    const scoped_refptr<base::ObserverListThreadSafe<SettingsObserver>>&
         observers,
     const std::string& extension_id,
     ValueStore* delegate,
diff --git a/chrome/browser/extensions/blacklist.h b/chrome/browser/extensions/blacklist.h
index c4e438a..c39214e 100644
--- a/chrome/browser/extensions/blacklist.h
+++ b/chrome/browser/extensions/blacklist.h
@@ -135,7 +135,7 @@ class Blacklist : public KeyedService,
   void ReturnBlacklistStateMap(const GetBlacklistedIDsCallback& callback,
                                const std::set<std::string>& blacklisted_ids);
 
-  ObserverList<Observer> observers_;
+  base::ObserverList<Observer> observers_;
 
   content::NotificationRegistrar registrar_;
 
diff --git a/chrome/browser/extensions/error_console/error_console.h b/chrome/browser/extensions/error_console/error_console.h
index fe5de34..9f2fc7a 100644
--- a/chrome/browser/extensions/error_console/error_console.h
+++ b/chrome/browser/extensions/error_console/error_console.h
@@ -168,11 +168,11 @@ class ErrorConsole : public KeyedService,
   // - This is a Dev Channel release.
   bool enabled_;
 
-  // Needed because ObserverList is not thread-safe.
+  // Needed because base::ObserverList is not thread-safe.
   base::ThreadChecker thread_checker_;
 
   // The list of all observers for the ErrorConsole.
-  ObserverList<Observer> observers_;
+  base::ObserverList<Observer> observers_;
 
   // The errors which we have received so far.
   ErrorMap errors_;
diff --git a/chrome/browser/extensions/extension_error_reporter.h b/chrome/browser/extensions/extension_error_reporter.h
index 480b150..2fbe9b9 100644
--- a/chrome/browser/extensions/extension_error_reporter.h
+++ b/chrome/browser/extensions/extension_error_reporter.h
@@ -81,7 +81,7 @@ class ExtensionErrorReporter {
   std::vector<base::string16> errors_;
   bool enable_noisy_errors_;
 
-  ObserverList<Observer> observers_;
+  base::ObserverList<Observer> observers_;
 };
 
 #endif  // CHROME_BROWSER_EXTENSIONS_EXTENSION_ERROR_REPORTER_H_
diff --git a/chrome/browser/extensions/extension_management.h b/chrome/browser/extensions/extension_management.h
index 756d9ad..6ea3874 100644
--- a/chrome/browser/extensions/extension_management.h
+++ b/chrome/browser/extensions/extension_management.h
@@ -184,7 +184,7 @@ class ExtensionManagement : public KeyedService {
 
   PrefService* pref_service_;
 
-  ObserverList<Observer, true> observer_list_;
+  base::ObserverList<Observer, true> observer_list_;
   PrefChangeRegistrar pref_change_registrar_;
   ScopedVector<ManagementPolicy::Provider> providers_;
 
diff --git a/chrome/browser/extensions/extension_service.h b/chrome/browser/extensions/extension_service.h
index 0b97b1a..3bd767a 100644
--- a/chrome/browser/extensions/extension_service.h
+++ b/chrome/browser/extensions/extension_service.h
@@ -740,7 +740,7 @@ class ExtensionService
   // The SharedModuleService used to check for import dependencies.
   scoped_ptr<extensions::SharedModuleService> shared_module_service_;
 
-  ObserverList<extensions::UpdateObserver, true> update_observers_;
+  base::ObserverList<extensions::UpdateObserver, true> update_observers_;
 
   // Migrates app data when upgrading a legacy packaged app to a platform app
   scoped_ptr<extensions::AppDataMigrator> app_data_migrator_;
diff --git a/chrome/browser/extensions/extension_toolbar_model.h b/chrome/browser/extensions/extension_toolbar_model.h
index cc53ea8..294d6b44 100644
--- a/chrome/browser/extensions/extension_toolbar_model.h
+++ b/chrome/browser/extensions/extension_toolbar_model.h
@@ -209,7 +209,7 @@ class ExtensionToolbarModel : public ExtensionActionAPI::Observer,
   void RemoveExtension(const Extension* extension);
 
   // Our observers.
-  ObserverList<Observer> observers_;
+  base::ObserverList<Observer> observers_;
 
   // The Profile this toolbar model is for.
   Profile* profile_;
diff --git a/chrome/browser/extensions/install_tracker.h b/chrome/browser/extensions/install_tracker.h
index 397ed46..4a3c264 100644
--- a/chrome/browser/extensions/install_tracker.h
+++ b/chrome/browser/extensions/install_tracker.h
@@ -87,7 +87,7 @@ class InstallTracker : public KeyedService,
   typedef std::map<std::string, ActiveInstallData> ActiveInstallsMap;
   ActiveInstallsMap active_installs_;
 
-  ObserverList<InstallObserver> observers_;
+  base::ObserverList<InstallObserver> observers_;
   content::NotificationRegistrar registrar_;
   PrefChangeRegistrar pref_change_registrar_;
   ScopedObserver<ExtensionRegistry, ExtensionRegistryObserver>
diff --git a/chrome/browser/extensions/tab_helper.h b/chrome/browser/extensions/tab_helper.h
index 3fe25e2..4608a06 100644
--- a/chrome/browser/extensions/tab_helper.h
+++ b/chrome/browser/extensions/tab_helper.h
@@ -216,7 +216,7 @@ class TabHelper : public content::WebContentsObserver,
 
   // Our content script observers. Declare at top so that it will outlive all
   // other members, since they might add themselves as observers.
-  ObserverList<ScriptExecutionObserver> script_execution_observers_;
+  base::ObserverList<ScriptExecutionObserver> script_execution_observers_;
 
   // If non-null this tab is an app tab and this is the extension the tab was
   // created for.
diff --git a/chrome/browser/extensions/window_controller_list.h b/chrome/browser/extensions/window_controller_list.h
index feeb42ad..7b7ab48 100644
--- a/chrome/browser/extensions/window_controller_list.h
+++ b/chrome/browser/extensions/window_controller_list.h
@@ -56,7 +56,7 @@ class WindowControllerList {
   // Entries are not owned by this class and must be removed when destroyed.
   ControllerList windows_;
 
-  ObserverList<WindowControllerListObserver> observers_;
+  base::ObserverList<WindowControllerListObserver> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(WindowControllerList);
 };
diff --git a/chrome/browser/local_discovery/service_discovery_client_mdns.h b/chrome/browser/local_discovery/service_discovery_client_mdns.h
index e3b25e2..bf397f7 100644
--- a/chrome/browser/local_discovery/service_discovery_client_mdns.h
+++ b/chrome/browser/local_discovery/service_discovery_client_mdns.h
@@ -54,7 +54,7 @@ class ServiceDiscoveryClientMdns
   void OnBeforeMdnsDestroy();
   void DestroyMdns();
 
-  ObserverList<Proxy, true> proxies_;
+  base::ObserverList<Proxy, true> proxies_;
 
   scoped_refptr<base::SequencedTaskRunner> mdns_runner_;
 
diff --git a/chrome/browser/local_discovery/wifi/mock_wifi_manager.h b/chrome/browser/local_discovery/wifi/mock_wifi_manager.h
index acf8296..820f771 100644
--- a/chrome/browser/local_discovery/wifi/mock_wifi_manager.h
+++ b/chrome/browser/local_discovery/wifi/mock_wifi_manager.h
@@ -68,7 +68,7 @@ class MockWifiManager : public WifiManager {
   SuccessCallback configure_and_connect_network_callback_;
   SuccessCallback connect_by_id_callback_;
   CredentialsCallback credentials_callback_;
-  ObserverList<NetworkListObserver> network_observers_;
+  base::ObserverList<NetworkListObserver> network_observers_;
 
   base::WeakPtrFactory<MockWifiManager> weak_factory_;
 };
diff --git a/chrome/browser/local_discovery/wifi/wifi_manager_nonchromeos.h b/chrome/browser/local_discovery/wifi/wifi_manager_nonchromeos.h
index 20d432f..e36fc0c 100644
--- a/chrome/browser/local_discovery/wifi/wifi_manager_nonchromeos.h
+++ b/chrome/browser/local_discovery/wifi/wifi_manager_nonchromeos.h
@@ -56,7 +56,7 @@ class WifiManagerNonChromeos : public WifiManager {
   std::string original_guid_;
   scoped_refptr<base::SequencedTaskRunner> task_runner_;
   WifiServiceWrapper* wifi_wrapper_;  // Owned. Deleted on file thread.
-  ObserverList<NetworkListObserver> network_list_observers_;
+  base::ObserverList<NetworkListObserver> network_list_observers_;
 
   base::WeakPtrFactory<WifiManagerNonChromeos> weak_factory_;
 
diff --git a/chrome/browser/media/media_capture_devices_dispatcher.h b/chrome/browser/media/media_capture_devices_dispatcher.h
index 8c28555..a428b61 100644
--- a/chrome/browser/media/media_capture_devices_dispatcher.h
+++ b/chrome/browser/media/media_capture_devices_dispatcher.h
@@ -224,7 +224,7 @@ class MediaCaptureDevicesDispatcher : public content::MediaObserver,
   content::MediaStreamDevices test_video_devices_;
 
   // A list of observers for the device update notifications.
-  ObserverList<Observer> observers_;
+  base::ObserverList<Observer> observers_;
 
   // Flag used by unittests to disable device enumeration.
   bool is_device_enumeration_disabled_;
diff --git a/chrome/browser/media/router/issue_manager.h b/chrome/browser/media/router/issue_manager.h
index 4c79477..badce23 100644
--- a/chrome/browser/media/router/issue_manager.h
+++ b/chrome/browser/media/router/issue_manager.h
@@ -64,7 +64,7 @@ class IssueManager {
   std::vector<Issue> issues_;
 
   // IssueObserver insteances are not owned by the manager.
-  ObserverList<IssuesObserver> issues_observers_;
+  base::ObserverList<IssuesObserver> issues_observers_;
 
   // The ID of the current top issue.
   Issue::IssueId top_issue_id_;
diff --git a/chrome/browser/media/router/media_router_mojo_impl.cc b/chrome/browser/media/router/media_router_mojo_impl.cc
index e48e054..8460e2c 100644
--- a/chrome/browser/media/router/media_router_mojo_impl.cc
+++ b/chrome/browser/media/router/media_router_mojo_impl.cc
@@ -196,10 +196,10 @@ void MediaRouterMojoImpl::RegisterMediaSinksObserver(
   // Create an observer list for the media source and add |observer|
   // to it. Fail if |observer| is already registered.
   const std::string& source_id = observer->source().id();
-  ObserverList<MediaSinksObserver>* observer_list =
+  base::ObserverList<MediaSinksObserver>* observer_list =
       sinks_observers_.get(source_id);
   if (!observer_list) {
-    observer_list = new ObserverList<MediaSinksObserver>;
+    observer_list = new base::ObserverList<MediaSinksObserver>;
     sinks_observers_.add(source_id, make_scoped_ptr(observer_list));
   } else {
     DCHECK(!observer_list->HasObserver(observer));
diff --git a/chrome/browser/media/router/media_router_mojo_impl.h b/chrome/browser/media/router/media_router_mojo_impl.h
index caf39f5..de9db92 100644
--- a/chrome/browser/media/router/media_router_mojo_impl.h
+++ b/chrome/browser/media/router/media_router_mojo_impl.h
@@ -140,10 +140,10 @@ class MediaRouterMojoImpl : public MediaRouter,
   std::vector<base::Closure> pending_requests_;
 
   base::ScopedPtrHashMap<MediaSourceId,
-                         scoped_ptr<ObserverList<MediaSinksObserver>>>
+                         scoped_ptr<base::ObserverList<MediaSinksObserver>>>
       sinks_observers_;
 
-  ObserverList<MediaRoutesObserver> routes_observers_;
+  base::ObserverList<MediaRoutesObserver> routes_observers_;
 
   // Binds |this| to listen for updates from the component extension Media
   // Router.
diff --git a/chrome/browser/media_galleries/media_galleries_preferences.h b/chrome/browser/media_galleries/media_galleries_preferences.h
index 5c40399..c60c75a 100644
--- a/chrome/browser/media_galleries/media_galleries_preferences.h
+++ b/chrome/browser/media_galleries/media_galleries_preferences.h
@@ -394,7 +394,7 @@ class MediaGalleriesPreferences
   // All pref ids in |device_map_| are also in |known_galleries_|.
   DeviceIdPrefIdsMap device_map_;
 
-  ObserverList<GalleryChangeObserver> gallery_change_observers_;
+  base::ObserverList<GalleryChangeObserver> gallery_change_observers_;
 
   base::WeakPtrFactory<MediaGalleriesPreferences> weak_factory_;
 
diff --git a/chrome/browser/metrics/variations/variations_service.h b/chrome/browser/metrics/variations/variations_service.h
index 5f2c4e9..3dda95d 100644
--- a/chrome/browser/metrics/variations/variations_service.h
+++ b/chrome/browser/metrics/variations/variations_service.h
@@ -271,7 +271,7 @@ class VariationsService
   int request_count_;
 
   // List of observers of the VariationsService.
-  ObserverList<Observer> observer_list_;
+  base::ObserverList<Observer> observer_list_;
 
 #if defined(OS_WIN)
   // Helper that handles synchronizing Variations with the Registry.
diff --git a/chrome/browser/net/pref_proxy_config_tracker_impl.h b/chrome/browser/net/pref_proxy_config_tracker_impl.h
index f09cfef..8055c26 100644
--- a/chrome/browser/net/pref_proxy_config_tracker_impl.h
+++ b/chrome/browser/net/pref_proxy_config_tracker_impl.h
@@ -57,7 +57,7 @@ class ChromeProxyConfigService
   void RegisterObserver();
 
   scoped_ptr<net::ProxyConfigService> base_service_;
-  ObserverList<net::ProxyConfigService::Observer, true> observers_;
+  base::ObserverList<net::ProxyConfigService::Observer, true> observers_;
 
   // Tracks configuration state of |pref_config_|. |pref_config_| is valid only
   // if |pref_config_state_| is not CONFIG_UNSET.
diff --git a/chrome/browser/net/pref_proxy_config_tracker_impl_unittest.cc b/chrome/browser/net/pref_proxy_config_tracker_impl_unittest.cc
index 793e9e7..d780b95 100644
--- a/chrome/browser/net/pref_proxy_config_tracker_impl_unittest.cc
+++ b/chrome/browser/net/pref_proxy_config_tracker_impl_unittest.cc
@@ -64,7 +64,7 @@ class TestProxyConfigService : public net::ProxyConfigService {
 
   net::ProxyConfig config_;
   ConfigAvailability availability_;
-  ObserverList<net::ProxyConfigService::Observer, true> observers_;
+  base::ObserverList<net::ProxyConfigService::Observer, true> observers_;
 };
 
 // A mock observer for capturing callbacks.
diff --git a/chrome/browser/notifications/message_center_settings_controller.h b/chrome/browser/notifications/message_center_settings_controller.h
index 50e12b6..6d81bbf 100644
--- a/chrome/browser/notifications/message_center_settings_controller.h
+++ b/chrome/browser/notifications/message_center_settings_controller.h
@@ -116,7 +116,7 @@ class MessageCenterSettingsController
   void RebuildNotifierGroups(bool notify);
 
   // The views displaying notifier settings.
-  ObserverList<message_center::NotifierSettingsObserver> observers_;
+  base::ObserverList<message_center::NotifierSettingsObserver> observers_;
 
   // The task tracker for loading favicons.
   scoped_ptr<base::CancelableTaskTracker> favicon_tracker_;
diff --git a/chrome/browser/plugins/plugin_installer.h b/chrome/browser/plugins/plugin_installer.h
index 7095daf..70ced4e 100644
--- a/chrome/browser/plugins/plugin_installer.h
+++ b/chrome/browser/plugins/plugin_installer.h
@@ -64,9 +64,9 @@ class PluginInstaller : public content::DownloadItem::Observer {
   void DownloadCancelled();
 
   InstallerState state_;
-  ObserverList<PluginInstallerObserver> observers_;
+  base::ObserverList<PluginInstallerObserver> observers_;
   int strong_observer_count_;
-  ObserverList<WeakPluginInstallerObserver> weak_observers_;
+  base::ObserverList<WeakPluginInstallerObserver> weak_observers_;
 
   FRIEND_TEST_ALL_PREFIXES(PluginInstallerTest,
                            StartInstalling_SuccessfulDownload);
diff --git a/chrome/browser/prefs/leveldb_pref_store.h b/chrome/browser/prefs/leveldb_pref_store.h
index 8badca6..093b025 100644
--- a/chrome/browser/prefs/leveldb_pref_store.h
+++ b/chrome/browser/prefs/leveldb_pref_store.h
@@ -94,7 +94,7 @@ class LevelDBPrefStore : public PersistentPrefStore {
 
   bool read_only_;
 
-  ObserverList<PrefStore::Observer, true> observers_;
+  base::ObserverList<PrefStore::Observer, true> observers_;
 
   scoped_ptr<ReadErrorDelegate> error_delegate_;
 
diff --git a/chrome/browser/prefs/pref_model_associator.h b/chrome/browser/prefs/pref_model_associator.h
index 4e72722..bbb17ba 100644
--- a/chrome/browser/prefs/pref_model_associator.h
+++ b/chrome/browser/prefs/pref_model_associator.h
@@ -179,7 +179,7 @@ class PrefModelAssociator
   // Map prefs to lists of observers. Observers will receive notification when
   // a pref changes, including the detail of whether or not the change came
   // from sync.
-  typedef ObserverList<SyncedPrefObserver> SyncedPrefObserverList;
+  typedef base::ObserverList<SyncedPrefObserver> SyncedPrefObserverList;
   typedef base::hash_map<std::string, SyncedPrefObserverList*>
       SyncedPrefObserverMap;
 
diff --git a/chrome/browser/prefs/pref_service_syncable.h b/chrome/browser/prefs/pref_service_syncable.h
index 4b35cfc..da52017 100644
--- a/chrome/browser/prefs/pref_service_syncable.h
+++ b/chrome/browser/prefs/pref_service_syncable.h
@@ -105,7 +105,7 @@ class PrefServiceSyncable : public PrefService {
   PrefModelAssociator pref_sync_associator_;
   PrefModelAssociator priority_pref_sync_associator_;
 
-  ObserverList<PrefServiceSyncableObserver> observer_list_;
+  base::ObserverList<PrefServiceSyncableObserver> observer_list_;
 
   DISALLOW_COPY_AND_ASSIGN(PrefServiceSyncable);
 };
diff --git a/chrome/browser/prefs/tracked/segregated_pref_store.h b/chrome/browser/prefs/tracked/segregated_pref_store.h
index 5184669..3edb5cd 100644
--- a/chrome/browser/prefs/tracked/segregated_pref_store.h
+++ b/chrome/browser/prefs/tracked/segregated_pref_store.h
@@ -101,7 +101,7 @@ class SegregatedPrefStore : public PersistentPrefStore {
   std::set<std::string> selected_preference_names_;
 
   scoped_ptr<PersistentPrefStore::ReadErrorDelegate> read_error_delegate_;
-  ObserverList<PrefStore::Observer, true> observers_;
+  base::ObserverList<PrefStore::Observer, true> observers_;
   AggregatingObserver aggregating_observer_;
 
   DISALLOW_COPY_AND_ASSIGN(SegregatedPrefStore);
diff --git a/chrome/browser/prerender/prerender_contents.h b/chrome/browser/prerender/prerender_contents.h
index 138e01d..d6b1b3b 100644
--- a/chrome/browser/prerender/prerender_contents.h
+++ b/chrome/browser/prerender/prerender_contents.h
@@ -330,7 +330,7 @@ class PrerenderContents : public content::NotificationObserver,
   // Message handlers.
   void OnCancelPrerenderForPrinting();
 
-  ObserverList<Observer> observer_list_;
+  base::ObserverList<Observer> observer_list_;
 
   // The prerender manager owning this object.
   PrerenderManager* prerender_manager_;
diff --git a/chrome/browser/profiles/profile_info_cache.h b/chrome/browser/profiles/profile_info_cache.h
index e090abd..2214d6d 100644
--- a/chrome/browser/profiles/profile_info_cache.h
+++ b/chrome/browser/profiles/profile_info_cache.h
@@ -218,7 +218,7 @@ class ProfileInfoCache : public ProfileInfoInterface,
   std::vector<std::string> sorted_keys_;
   base::FilePath user_data_dir_;
 
-  mutable ObserverList<ProfileInfoCacheObserver> observer_list_;
+  mutable base::ObserverList<ProfileInfoCacheObserver> observer_list_;
 
   // A cache of gaia/high res avatar profile pictures. This cache is updated
   // lazily so it needs to be mutable.
diff --git a/chrome/browser/safe_browsing/ui_manager.h b/chrome/browser/safe_browsing/ui_manager.h
index cdef1be..dfba25a 100644
--- a/chrome/browser/safe_browsing/ui_manager.h
+++ b/chrome/browser/safe_browsing/ui_manager.h
@@ -167,7 +167,7 @@ class SafeBrowsingUIManager
   // Only access this whitelist from the UI thread.
   std::vector<WhiteListedEntry> white_listed_entries_;
 
-  ObserverList<Observer> observer_list_;
+  base::ObserverList<Observer> observer_list_;
 
   DISALLOW_COPY_AND_ASSIGN(SafeBrowsingUIManager);
 };
diff --git a/chrome/browser/search/instant_service.h b/chrome/browser/search/instant_service.h
index b650346..1b6ca1f 100644
--- a/chrome/browser/search/instant_service.h
+++ b/chrome/browser/search/instant_service.h
@@ -161,7 +161,7 @@ class InstantService : public KeyedService,
   // text or assets properly with the omnibox.
   int omnibox_start_margin_;
 
-  ObserverList<InstantServiceObserver> observers_;
+  base::ObserverList<InstantServiceObserver> observers_;
 
   content::NotificationRegistrar registrar_;
 
diff --git a/chrome/browser/sessions/tab_restore_service_helper.h b/chrome/browser/sessions/tab_restore_service_helper.h
index 520f4a2..7666833 100644
--- a/chrome/browser/sessions/tab_restore_service_helper.h
+++ b/chrome/browser/sessions/tab_restore_service_helper.h
@@ -178,7 +178,7 @@ class TabRestoreServiceHelper {
   // historical tab.
   bool restoring_;
 
-  ObserverList<TabRestoreServiceObserver> observer_list_;
+  base::ObserverList<TabRestoreServiceObserver> observer_list_;
 
   // Set of delegates that we've received a BrowserClosing method for but no
   // corresponding BrowserClosed. We cache the set of delegates closing to
diff --git a/chrome/browser/signin/cross_device_promo.h b/chrome/browser/signin/cross_device_promo.h
index 8ce62b0..50dd479 100644
--- a/chrome/browser/signin/cross_device_promo.h
+++ b/chrome/browser/signin/cross_device_promo.h
@@ -103,7 +103,7 @@ class CrossDevicePromo : public KeyedService,
   SigninClient* signin_client_;
 
   scoped_ptr<DeviceActivityFetcher> device_activity_fetcher_;
-  ObserverList<CrossDevicePromo::Observer> observer_list_;
+  base::ObserverList<CrossDevicePromo::Observer> observer_list_;
 
   // Maximum time since activity seen on another device that activity is
   // considered within a context switch.
diff --git a/chrome/browser/signin/easy_unlock_service.h b/chrome/browser/signin/easy_unlock_service.h
index 049023d..0b577c7 100644
--- a/chrome/browser/signin/easy_unlock_service.h
+++ b/chrome/browser/signin/easy_unlock_service.h
@@ -357,7 +357,7 @@ class EasyUnlockService : public KeyedService,
 
   bool tpm_key_checked_;
 
-  ObserverList<EasyUnlockServiceObserver> observers_;
+  base::ObserverList<EasyUnlockServiceObserver> observers_;
 
   base::WeakPtrFactory<EasyUnlockService> weak_ptr_factory_;
 
diff --git a/chrome/browser/signin/signin_manager_factory.h b/chrome/browser/signin/signin_manager_factory.h
index dec6b6d..ee56185 100644
--- a/chrome/browser/signin/signin_manager_factory.h
+++ b/chrome/browser/signin/signin_manager_factory.h
@@ -79,7 +79,7 @@ class SigninManagerFactory : public BrowserContextKeyedServiceFactory {
   ~SigninManagerFactory() override;
 
   // List of observers. Checks that list is empty on destruction.
-  mutable ObserverList<Observer, true> observer_list_;
+  mutable base::ObserverList<Observer, true> observer_list_;
 
   // BrowserContextKeyedServiceFactory:
   KeyedService* BuildServiceInstanceFor(
diff --git a/chrome/browser/spellchecker/spellcheck_custom_dictionary.h b/chrome/browser/spellchecker/spellcheck_custom_dictionary.h
index b8b329e..6ee7828 100644
--- a/chrome/browser/spellchecker/spellcheck_custom_dictionary.h
+++ b/chrome/browser/spellchecker/spellcheck_custom_dictionary.h
@@ -166,7 +166,7 @@ class SpellcheckCustomDictionary : public SpellcheckDictionary,
   base::FilePath custom_dictionary_path_;
 
   // Observers for changes in dictionary load status and content changes.
-  ObserverList<Observer> observers_;
+  base::ObserverList<Observer> observers_;
 
   // Used to send local changes to the sync infrastructure.
   scoped_ptr<syncer::SyncChangeProcessor> sync_processor_;
diff --git a/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.h b/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.h
index 7f95df4..92f6b52 100644
--- a/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.h
+++ b/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.h
@@ -150,7 +150,7 @@ class SpellcheckHunspellDictionary
   SpellcheckService* spellcheck_service_;
 
   // Observers of Hunspell dictionary events.
-  ObserverList<Observer> observers_;
+  base::ObserverList<Observer> observers_;
 
   // Status of the dictionary download.
   DownloadStatus download_status_;
diff --git a/chrome/browser/status_icons/status_icon.h b/chrome/browser/status_icons/status_icon.h
index b35af0e..4f35abc 100644
--- a/chrome/browser/status_icons/status_icon.h
+++ b/chrome/browser/status_icons/status_icon.h
@@ -71,7 +71,7 @@ class StatusIcon {
   virtual void UpdatePlatformContextMenu(StatusIconMenuModel* model) = 0;
 
  private:
-  ObserverList<StatusIconObserver> observers_;
+  base::ObserverList<StatusIconObserver> observers_;
 
   // Context menu, if any.
   scoped_ptr<StatusIconMenuModel> context_menu_contents_;
diff --git a/chrome/browser/status_icons/status_icon_menu_model.h b/chrome/browser/status_icons/status_icon_menu_model.h
index 6eb4a5e..7481420 100644
--- a/chrome/browser/status_icons/status_icon_menu_model.h
+++ b/chrome/browser/status_icons/status_icon_menu_model.h
@@ -108,7 +108,7 @@ class StatusIconMenuModel
 
   ItemStateMap item_states_;
 
-  ObserverList<Observer> observer_list_;
+  base::ObserverList<Observer> observer_list_;
 
   Delegate* delegate_;
 
diff --git a/chrome/browser/supervised_user/legacy/supervised_user_sync_service.h b/chrome/browser/supervised_user/legacy/supervised_user_sync_service.h
index abde2ac..02f08de 100644
--- a/chrome/browser/supervised_user/legacy/supervised_user_sync_service.h
+++ b/chrome/browser/supervised_user/legacy/supervised_user_sync_service.h
@@ -161,7 +161,7 @@ class SupervisedUserSyncService : public KeyedService,
   scoped_ptr<syncer::SyncChangeProcessor> sync_processor_;
   scoped_ptr<syncer::SyncErrorFactory> error_handler_;
 
-  ObserverList<SupervisedUserSyncServiceObserver> observers_;
+  base::ObserverList<SupervisedUserSyncServiceObserver> observers_;
 
   std::vector<SupervisedUsersCallback> callbacks_;
 
diff --git a/chrome/browser/supervised_user/supervised_user_pref_store.h b/chrome/browser/supervised_user/supervised_user_pref_store.h
index c8a4e81..7cccf85 100644
--- a/chrome/browser/supervised_user/supervised_user_pref_store.h
+++ b/chrome/browser/supervised_user/supervised_user_pref_store.h
@@ -42,7 +42,7 @@ class SupervisedUserPrefStore : public PrefStore {
 
   scoped_ptr<PrefValueMap> prefs_;
 
-  ObserverList<PrefStore::Observer, true> observers_;
+  base::ObserverList<PrefStore::Observer, true> observers_;
 
   base::WeakPtrFactory<SupervisedUserPrefStore> weak_ptr_factory_;
 };
diff --git a/chrome/browser/supervised_user/supervised_user_service.h b/chrome/browser/supervised_user/supervised_user_service.h
index 1f10b59..27bc3a3 100644
--- a/chrome/browser/supervised_user/supervised_user_service.h
+++ b/chrome/browser/supervised_user/supervised_user_service.h
@@ -351,7 +351,7 @@ class SupervisedUserService : public KeyedService,
   // Used to create permission requests.
   ScopedVector<PermissionRequestCreator> permissions_creators_;
 
-  ObserverList<SupervisedUserServiceObserver> observer_list_;
+  base::ObserverList<SupervisedUserServiceObserver> observer_list_;
 
   base::WeakPtrFactory<SupervisedUserService> weak_ptr_factory_;
 };
diff --git a/chrome/browser/supervised_user/supervised_user_url_filter.h b/chrome/browser/supervised_user/supervised_user_url_filter.h
index 47c8ebe..dc2761c 100644
--- a/chrome/browser/supervised_user/supervised_user_url_filter.h
+++ b/chrome/browser/supervised_user/supervised_user_url_filter.h
@@ -175,7 +175,7 @@ class SupervisedUserURLFilter
                      FilteringBehavior behavior,
                      bool uncertain) const;
 
-  ObserverList<Observer> observers_;
+  base::ObserverList<Observer> observers_;
 
   FilteringBehavior default_behavior_;
   scoped_ptr<Contents> contents_;
diff --git a/chrome/browser/sync/backend_migrator.h b/chrome/browser/sync/backend_migrator.h
index 64bce1a..cbd8682 100644
--- a/chrome/browser/sync/backend_migrator.h
+++ b/chrome/browser/sync/backend_migrator.h
@@ -94,7 +94,7 @@ class BackendMigrator {
 
   State state_;
 
-  ObserverList<MigrationObserver> migration_observers_;
+  base::ObserverList<MigrationObserver> migration_observers_;
 
   syncer::ModelTypeSet to_migrate_;
 
diff --git a/chrome/browser/sync/profile_sync_service.h b/chrome/browser/sync/profile_sync_service.h
index ff2e2b0..c2af06d 100644
--- a/chrome/browser/sync/profile_sync_service.h
+++ b/chrome/browser/sync/profile_sync_service.h
@@ -952,9 +952,10 @@ class ProfileSyncService : public sync_driver::SyncService,
   // Manager for the non-blocking data types.
   sync_driver::NonBlockingDataTypeManager non_blocking_data_type_manager_;
 
-  ObserverList<sync_driver::SyncServiceObserver> observers_;
-  ObserverList<browser_sync::ProtocolEventObserver> protocol_event_observers_;
-  ObserverList<syncer::TypeDebugInfoObserver> type_debug_info_observers_;
+  base::ObserverList<sync_driver::SyncServiceObserver> observers_;
+  base::ObserverList<browser_sync::ProtocolEventObserver>
+      protocol_event_observers_;
+  base::ObserverList<syncer::TypeDebugInfoObserver> type_debug_info_observers_;
 
   std::set<SyncTypePreferenceProvider*> preference_providers_;
 
diff --git a/chrome/browser/sync/sync_error_controller.h b/chrome/browser/sync/sync_error_controller.h
index 94535a9..03bc907 100644
--- a/chrome/browser/sync/sync_error_controller.h
+++ b/chrome/browser/sync/sync_error_controller.h
@@ -38,7 +38,7 @@ class SyncErrorController : public sync_driver::SyncServiceObserver {
 
  private:
   ProfileSyncService* service_;
-  ObserverList<Observer, true> observer_list_;
+  base::ObserverList<Observer, true> observer_list_;
 
   DISALLOW_COPY_AND_ASSIGN(SyncErrorController);
 };
diff --git a/chrome/browser/sync_file_system/drive_backend/fake_sync_worker.h b/chrome/browser/sync_file_system/drive_backend/fake_sync_worker.h
index 4562824..2103427 100644
--- a/chrome/browser/sync_file_system/drive_backend/fake_sync_worker.h
+++ b/chrome/browser/sync_file_system/drive_backend/fake_sync_worker.h
@@ -101,7 +101,7 @@ class FakeSyncWorker : public SyncWorkerInterface {
 
   scoped_ptr<SyncEngineContext> sync_engine_context_;
 
-  ObserverList<Observer> observers_;
+  base::ObserverList<Observer> observers_;
   base::SequenceChecker sequence_checker_;
 
   DISALLOW_COPY_AND_ASSIGN(FakeSyncWorker);
diff --git a/chrome/browser/sync_file_system/drive_backend/sync_engine.h b/chrome/browser/sync_file_system/drive_backend/sync_engine.h
index 81315db..fc583f7 100644
--- a/chrome/browser/sync_file_system/drive_backend/sync_engine.h
+++ b/chrome/browser/sync_file_system/drive_backend/sync_engine.h
@@ -222,8 +222,8 @@ class SyncEngine : public RemoteFileSyncService,
   scoped_ptr<WorkerObserver> worker_observer_;
   scoped_ptr<SyncWorkerInterface> sync_worker_;
 
-  ObserverList<SyncServiceObserver> service_observers_;
-  ObserverList<FileStatusObserver> file_status_observers_;
+  base::ObserverList<SyncServiceObserver> service_observers_;
+  base::ObserverList<FileStatusObserver> file_status_observers_;
   leveldb::Env* env_override_;
 
   CallbackTracker callback_tracker_;
diff --git a/chrome/browser/sync_file_system/drive_backend/sync_worker.h b/chrome/browser/sync_file_system/drive_backend/sync_worker.h
index 1cf701c..7ae7606 100644
--- a/chrome/browser/sync_file_system/drive_backend/sync_worker.h
+++ b/chrome/browser/sync_file_system/drive_backend/sync_worker.h
@@ -169,7 +169,7 @@ class SyncWorker : public SyncWorkerInterface,
   base::WeakPtr<ExtensionServiceInterface> extension_service_;
 
   scoped_ptr<SyncEngineContext> context_;
-  ObserverList<Observer> observers_;
+  base::ObserverList<Observer> observers_;
 
   base::SequenceChecker sequence_checker_;
 
diff --git a/chrome/browser/sync_file_system/local/canned_syncable_file_system.h b/chrome/browser/sync_file_system/local/canned_syncable_file_system.h
index 13ebb83..cb95f7a 100644
--- a/chrome/browser/sync_file_system/local/canned_syncable_file_system.h
+++ b/chrome/browser/sync_file_system/local/canned_syncable_file_system.h
@@ -211,7 +211,8 @@ class CannedSyncableFileSystem
                           const storage::StatusCallback& callback);
 
  private:
-  typedef ObserverListThreadSafe<LocalFileSyncStatus::Observer> ObserverList;
+  typedef base::ObserverListThreadSafe<LocalFileSyncStatus::Observer>
+      ObserverList;
 
   // Callbacks.
   void DidOpenFileSystem(base::SingleThreadTaskRunner* original_task_runner,
diff --git a/chrome/browser/sync_file_system/local/local_file_sync_context.h b/chrome/browser/sync_file_system/local/local_file_sync_context.h
index 6a18c81..96a0ba44 100644
--- a/chrome/browser/sync_file_system/local/local_file_sync_context.h
+++ b/chrome/browser/sync_file_system/local/local_file_sync_context.h
@@ -368,7 +368,7 @@ class LocalFileSyncContext
   // ApplyRemoteChange(). Modified only on IO thread.
   scoped_ptr<RootDeleteHelper> root_delete_helper_;
 
-  ObserverList<LocalOriginChangeObserver> origin_change_observers_;
+  base::ObserverList<LocalOriginChangeObserver> origin_change_observers_;
 
   int mock_notify_changes_duration_in_sec_;
 
diff --git a/chrome/browser/sync_file_system/local/local_file_sync_service.h b/chrome/browser/sync_file_system/local/local_file_sync_service.h
index dbf24c5..26c5949 100644
--- a/chrome/browser/sync_file_system/local/local_file_sync_service.h
+++ b/chrome/browser/sync_file_system/local/local_file_sync_service.h
@@ -235,7 +235,7 @@ class LocalFileSyncService
   LocalChangeProcessor* local_change_processor_;
   GetLocalChangeProcessorCallback get_local_change_processor_;
 
-  ObserverList<Observer> change_observers_;
+  base::ObserverList<Observer> change_observers_;
 
   DISALLOW_COPY_AND_ASSIGN(LocalFileSyncService);
 };
diff --git a/chrome/browser/sync_file_system/local/local_file_sync_status.h b/chrome/browser/sync_file_system/local/local_file_sync_status.h
index c4e12f7..1556d97 100644
--- a/chrome/browser/sync_file_system/local/local_file_sync_status.h
+++ b/chrome/browser/sync_file_system/local/local_file_sync_status.h
@@ -95,7 +95,7 @@ class LocalFileSyncStatus
   // If this flag is set sync process is running on the file.
   URLSet syncing_;
 
-  ObserverList<Observer> observer_list_;
+  base::ObserverList<Observer> observer_list_;
 
   DISALLOW_COPY_AND_ASSIGN(LocalFileSyncStatus);
 };
diff --git a/chrome/browser/sync_file_system/mock_remote_file_sync_service.h b/chrome/browser/sync_file_system/mock_remote_file_sync_service.h
index 92c274a..456c6f7 100644
--- a/chrome/browser/sync_file_system/mock_remote_file_sync_service.h
+++ b/chrome/browser/sync_file_system/mock_remote_file_sync_service.h
@@ -85,8 +85,8 @@ class MockRemoteFileSyncService : public RemoteFileSyncService {
   // For default implementation.
   ::testing::NiceMock<MockLocalChangeProcessor> mock_local_change_processor_;
 
-  ObserverList<Observer> service_observers_;
-  ObserverList<FileStatusObserver> file_status_observers_;
+  base::ObserverList<Observer> service_observers_;
+  base::ObserverList<FileStatusObserver> file_status_observers_;
 
   RemoteServiceState state_;
 
diff --git a/chrome/browser/sync_file_system/sync_file_system_service.h b/chrome/browser/sync_file_system/sync_file_system_service.h
index 13587e9..0d642e6 100644
--- a/chrome/browser/sync_file_system/sync_file_system_service.h
+++ b/chrome/browser/sync_file_system/sync_file_system_service.h
@@ -179,7 +179,7 @@ class SyncFileSystemService
   bool sync_enabled_;
 
   TaskLogger task_logger_;
-  ObserverList<SyncEventObserver> observers_;
+  base::ObserverList<SyncEventObserver> observers_;
 
   bool promoting_demoted_changes_;
   base::Closure idle_callback_;
diff --git a/chrome/browser/sync_file_system/task_logger.h b/chrome/browser/sync_file_system/task_logger.h
index cea0304..089bd65 100644
--- a/chrome/browser/sync_file_system/task_logger.h
+++ b/chrome/browser/sync_file_system/task_logger.h
@@ -58,7 +58,7 @@ class TaskLogger : public base::SupportsWeakPtr<TaskLogger> {
  private:
   std::deque<TaskLog*> log_history_;
 
-  ObserverList<Observer> observers_;
+  base::ObserverList<Observer> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(TaskLogger);
 };
diff --git a/chrome/browser/task_manager/task_manager.h b/chrome/browser/task_manager/task_manager.h
index 828246b..b59436d 100644
--- a/chrome/browser/task_manager/task_manager.h
+++ b/chrome/browser/task_manager/task_manager.h
@@ -510,7 +510,7 @@ class TaskManagerModel : public base::RefCountedThreadSafe<TaskManagerModel> {
   scoped_ptr<TaskManagerModelGpuDataManagerObserver>
       video_memory_usage_stats_observer_;
 
-  ObserverList<TaskManagerModelObserver> observer_list_;
+  base::ObserverList<TaskManagerModelObserver> observer_list_;
 
   // How many calls to StartUpdating have been made without matching calls to
   // StopUpdating.
diff --git a/chrome/browser/ui/app_list/app_list_view_delegate.h b/chrome/browser/ui/app_list/app_list_view_delegate.h
index d351d85..ff51b40 100644
--- a/chrome/browser/ui/app_list/app_list_view_delegate.h
+++ b/chrome/browser/ui/app_list/app_list_view_delegate.h
@@ -196,7 +196,7 @@ class AppListViewDelegate : public app_list::AppListViewDelegate,
   scoped_ptr<AppSyncUIStateWatcher> app_sync_ui_state_watcher_;
 #endif
 
-  ObserverList<app_list::AppListViewDelegateObserver> observers_;
+  base::ObserverList<app_list::AppListViewDelegateObserver> observers_;
 
   ScopedObserver<TemplateURLService, AppListViewDelegate>
       template_url_service_observer_;
diff --git a/chrome/browser/ui/app_list/start_page_service.h b/chrome/browser/ui/app_list/start_page_service.h
index 207cf91..8e512f4 100644
--- a/chrome/browser/ui/app_list/start_page_service.h
+++ b/chrome/browser/ui/app_list/start_page_service.h
@@ -161,7 +161,7 @@ class StartPageService : public KeyedService,
   scoped_ptr<StartPageWebContentsDelegate> contents_delegate_;
   scoped_ptr<ProfileDestroyObserver> profile_destroy_observer_;
   SpeechRecognitionState state_;
-  ObserverList<StartPageObserver> observers_;
+  base::ObserverList<StartPageObserver> observers_;
   bool speech_button_toggled_manually_;
   bool speech_result_obtained_;
 
diff --git a/chrome/browser/ui/app_list/test/fake_profile_store.h b/chrome/browser/ui/app_list/test/fake_profile_store.h
index 12061b0..2b2c586 100644
--- a/chrome/browser/ui/app_list/test/fake_profile_store.h
+++ b/chrome/browser/ui/app_list/test/fake_profile_store.h
@@ -38,7 +38,7 @@ class FakeProfileStore : public ProfileStore {
   typedef std::map<base::FilePath, base::Callback<void(Profile*)> >
       CallbacksByPath;
   CallbacksByPath callbacks_;
-  ObserverList<ProfileInfoCacheObserver> observer_list_;
+  base::ObserverList<ProfileInfoCacheObserver> observer_list_;
   typedef std::map<base::FilePath, Profile*> ProfilesByPath;
   ProfilesByPath loaded_profiles_;
 };
diff --git a/chrome/browser/ui/ash/app_sync_ui_state.h b/chrome/browser/ui/ash/app_sync_ui_state.h
index a375d49..e130826 100644
--- a/chrome/browser/ui/ash/app_sync_ui_state.h
+++ b/chrome/browser/ui/ash/app_sync_ui_state.h
@@ -81,7 +81,7 @@ class AppSyncUIState : public KeyedService,
   base::OneShotTimer<AppSyncUIState> max_syncing_status_timer_;
 
   Status status_;
-  ObserverList<AppSyncUIStateObserver> observers_;
+  base::ObserverList<AppSyncUIStateObserver> observers_;
 
   extensions::ExtensionRegistry* extension_registry_;
 
diff --git a/chrome/browser/ui/ash/chrome_shell_delegate.h b/chrome/browser/ui/ash/chrome_shell_delegate.h
index ae87ac1..148ecc6 100644
--- a/chrome/browser/ui/ash/chrome_shell_delegate.h
+++ b/chrome/browser/ui/ash/chrome_shell_delegate.h
@@ -92,7 +92,8 @@ class ChromeShellDelegate : public ash::ShellDelegate,
 
   ChromeLauncherController* shelf_delegate_;
 
-  ObserverList<ash::VirtualKeyboardStateObserver> keyboard_state_observer_list_;
+  base::ObserverList<ash::VirtualKeyboardStateObserver>
+      keyboard_state_observer_list_;
 
   // Proxies events from chrome/browser to ash::UserMetricsRecorder.
   scoped_ptr<ChromeUserMetricsRecorder> chrome_user_metrics_recorder_;
diff --git a/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.h b/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.h
index 6ca57b6..3507d5e 100644
--- a/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.h
+++ b/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.h
@@ -234,7 +234,7 @@ class MultiUserWindowManagerChromeOS
   UserIDToAppWindowObserver user_id_to_app_observer_;
 
   // An observer list to be notified upon window owner changes.
-  ObserverList<Observer> observers_;
+  base::ObserverList<Observer> observers_;
 
   // A map which remembers for owned transient windows their own visibility.
   TransientWindowToVisibility transient_window_to_visibility_;
diff --git a/chrome/browser/ui/ash/session_state_delegate_chromeos.h b/chrome/browser/ui/ash/session_state_delegate_chromeos.h
index 2b26148..1a8d003 100644
--- a/chrome/browser/ui/ash/session_state_delegate_chromeos.h
+++ b/chrome/browser/ui/ash/session_state_delegate_chromeos.h
@@ -80,7 +80,7 @@ class SessionStateDelegateChromeos
   void TryToSwitchUser(const std::string& user_id);
 
   // List of observers is only used on Chrome OS for now.
-  ObserverList<ash::SessionStateObserver> session_state_observer_list_;
+  base::ObserverList<ash::SessionStateObserver> session_state_observer_list_;
 
   // Session state (e.g. login screen vs. user session).
   SessionState session_state_;
diff --git a/chrome/browser/ui/ash/system_tray_delegate_chromeos.h b/chrome/browser/ui/ash/system_tray_delegate_chromeos.h
index cbb4882..b909e06 100644
--- a/chrome/browser/ui/ash/system_tray_delegate_chromeos.h
+++ b/chrome/browser/ui/ash/system_tray_delegate_chromeos.h
@@ -304,10 +304,10 @@ class SystemTrayDelegateChromeOS
   scoped_ptr<ShutdownPolicyHandler> shutdown_policy_handler_;
   scoped_ptr<ash::VPNDelegate> vpn_delegate_;
 
-  ObserverList<ash::CustodianInfoTrayObserver>
+  base::ObserverList<ash::CustodianInfoTrayObserver>
       custodian_info_changed_observers_;
 
-  ObserverList<ash::ShutdownPolicyObserver> shutdown_policy_observers_;
+  base::ObserverList<ash::ShutdownPolicyObserver> shutdown_policy_observers_;
 
   base::WeakPtrFactory<SystemTrayDelegateChromeOS> weak_ptr_factory_;
 
diff --git a/chrome/browser/ui/bookmarks/recently_used_folders_combo_model.h b/chrome/browser/ui/bookmarks/recently_used_folders_combo_model.h
index 9f6c7e8..c46c548 100644
--- a/chrome/browser/ui/bookmarks/recently_used_folders_combo_model.h
+++ b/chrome/browser/ui/bookmarks/recently_used_folders_combo_model.h
@@ -88,7 +88,7 @@ class RecentlyUsedFoldersComboModel : public ui::ComboboxModel,
   // The index of the original parent folder.
   int node_parent_index_;
 
-  ObserverList<ui::ComboboxModelObserver> observers_;
+  base::ObserverList<ui::ComboboxModelObserver> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(RecentlyUsedFoldersComboModel);
 };
diff --git a/chrome/browser/ui/libgtk2ui/gtk2_ui.h b/chrome/browser/ui/libgtk2ui/gtk2_ui.h
index d5d37f9..5497591 100644
--- a/chrome/browser/ui/libgtk2ui/gtk2_ui.h
+++ b/chrome/browser/ui/libgtk2ui/gtk2_ui.h
@@ -254,7 +254,7 @@ class Gtk2UI : public views::LinuxUI {
   scoped_ptr<Gtk2KeyBindingsHandler> key_bindings_handler_;
 
   // Objects to notify when the window frame button order changes.
-  ObserverList<views::WindowButtonOrderObserver> observer_list_;
+  base::ObserverList<views::WindowButtonOrderObserver> observer_list_;
 
   // Whether we should lower the window on a middle click to the non client
   // area.
diff --git a/chrome/browser/ui/omnibox/omnibox_popup_model.h b/chrome/browser/ui/omnibox/omnibox_popup_model.h
index 0189c80..c8626d7 100644
--- a/chrome/browser/ui/omnibox/omnibox_popup_model.h
+++ b/chrome/browser/ui/omnibox/omnibox_popup_model.h
@@ -154,7 +154,7 @@ class OmniboxPopupModel {
   AutocompleteResult::Selection manually_selected_match_;
 
   // Observers.
-  ObserverList<OmniboxPopupModelObserver> observers_;
+  base::ObserverList<OmniboxPopupModelObserver> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(OmniboxPopupModel);
 };
diff --git a/chrome/browser/ui/panels/display_settings_provider.h b/chrome/browser/ui/panels/display_settings_provider.h
index 2737a28..3a708ae 100644
--- a/chrome/browser/ui/panels/display_settings_provider.h
+++ b/chrome/browser/ui/panels/display_settings_provider.h
@@ -107,15 +107,15 @@ class DisplaySettingsProvider {
   virtual DesktopBarVisibility GetDesktopBarVisibility(
       DesktopBarAlignment alignment) const;
 
-  ObserverList<DisplayObserver>& display_observers() {
+  base::ObserverList<DisplayObserver>& display_observers() {
     return display_observers_;
   }
 
-  ObserverList<DesktopBarObserver>& desktop_bar_observers() {
+  base::ObserverList<DesktopBarObserver>& desktop_bar_observers() {
     return desktop_bar_observers_;
   }
 
-  ObserverList<FullScreenObserver>& full_screen_observers() {
+  base::ObserverList<FullScreenObserver>& full_screen_observers() {
     return full_screen_observers_;
   }
 
@@ -141,9 +141,9 @@ class DisplaySettingsProvider {
 
  private:
   // Observers that listen to various display settings changes.
-  ObserverList<DisplayObserver> display_observers_;
-  ObserverList<DesktopBarObserver> desktop_bar_observers_;
-  ObserverList<FullScreenObserver> full_screen_observers_;
+  base::ObserverList<DisplayObserver> display_observers_;
+  base::ObserverList<DesktopBarObserver> desktop_bar_observers_;
+  base::ObserverList<FullScreenObserver> full_screen_observers_;
 
   // True if full screen mode or presentation mode is entered.
   bool is_full_screen_;
diff --git a/chrome/browser/ui/panels/panel_mouse_watcher.h b/chrome/browser/ui/panels/panel_mouse_watcher.h
index 7ba4767..3d69d07 100644
--- a/chrome/browser/ui/panels/panel_mouse_watcher.h
+++ b/chrome/browser/ui/panels/panel_mouse_watcher.h
@@ -50,7 +50,7 @@ class PanelMouseWatcher {
   virtual void Start() = 0;
   virtual void Stop() = 0;
 
-  ObserverList<PanelMouseWatcherObserver> observers_;
+  base::ObserverList<PanelMouseWatcherObserver> observers_;
 };
 
 #endif  // CHROME_BROWSER_UI_PANELS_PANEL_MOUSE_WATCHER_H_
diff --git a/chrome/browser/ui/search/search_model.h b/chrome/browser/ui/search/search_model.h
index dfbdf4f..3e97cf2 100644
--- a/chrome/browser/ui/search/search_model.h
+++ b/chrome/browser/ui/search/search_model.h
@@ -80,7 +80,7 @@ class SearchModel {
   State state_;
 
   // Observers.
-  ObserverList<SearchModelObserver> observers_;
+  base::ObserverList<SearchModelObserver> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(SearchModel);
 };
diff --git a/chrome/browser/ui/settings_window_manager.h b/chrome/browser/ui/settings_window_manager.h
index 5c5ec7b..5618dc2 100644
--- a/chrome/browser/ui/settings_window_manager.h
+++ b/chrome/browser/ui/settings_window_manager.h
@@ -48,7 +48,7 @@ class SettingsWindowManager {
   SettingsWindowManager();
   ~SettingsWindowManager();
 
-  ObserverList<SettingsWindowManagerObserver> observers_;
+  base::ObserverList<SettingsWindowManagerObserver> observers_;
   ProfileSessionMap settings_session_map_;
 
   DISALLOW_COPY_AND_ASSIGN(SettingsWindowManager);
diff --git a/chrome/browser/ui/tabs/tab_strip_model.h b/chrome/browser/ui/tabs/tab_strip_model.h
index bf2b467..dd45922 100644
--- a/chrome/browser/ui/tabs/tab_strip_model.h
+++ b/chrome/browser/ui/tabs/tab_strip_model.h
@@ -570,7 +570,7 @@ class TabStripModel {
   scoped_ptr<TabStripModelOrderController> order_controller_;
 
   // Our observers.
-  typedef ObserverList<TabStripModelObserver> TabStripModelObservers;
+  typedef base::ObserverList<TabStripModelObserver> TabStripModelObservers;
   TabStripModelObservers observers_;
 
   ui::ListSelectionModel selection_model_;
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.h b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.h
index 1867de7..644e12f 100644
--- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.h
+++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.h
@@ -461,7 +461,7 @@ class BookmarkBarView : public views::AccessiblePaneView,
   // Are we animating to or from the detached state?
   bool animating_detached_;
 
-  ObserverList<BookmarkBarViewObserver> observers_;
+  base::ObserverList<BookmarkBarViewObserver> observers_;
 
   // Factory used to delay showing of the drop menu.
   base::WeakPtrFactory<BookmarkBarView> show_folder_method_factory_;
diff --git a/chrome/browser/ui/views/frame/browser_view_layout.cc b/chrome/browser/ui/views/frame/browser_view_layout.cc
index 9bf394b..11405f6 100644
--- a/chrome/browser/ui/views/frame/browser_view_layout.cc
+++ b/chrome/browser/ui/views/frame/browser_view_layout.cc
@@ -108,7 +108,7 @@ class BrowserViewLayout::WebContentsModalDialogHostViews
 
   BrowserViewLayout* const browser_view_layout_;
 
-  ObserverList<ModalDialogHostObserver> observer_list_;
+  base::ObserverList<ModalDialogHostObserver> observer_list_;
 
   DISALLOW_COPY_AND_ASSIGN(WebContentsModalDialogHostViews);
 };
diff --git a/chrome/browser/ui/views/frame/immersive_mode_controller.h b/chrome/browser/ui/views/frame/immersive_mode_controller.h
index 2e059f3..21aca58 100644
--- a/chrome/browser/ui/views/frame/immersive_mode_controller.h
+++ b/chrome/browser/ui/views/frame/immersive_mode_controller.h
@@ -109,7 +109,7 @@ class ImmersiveModeController {
   virtual void RemoveObserver(Observer* observer);
 
  protected:
-  ObserverList<Observer> observers_;
+  base::ObserverList<Observer> observers_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ImmersiveModeController);
diff --git a/chrome/browser/ui/views/tabs/tab_strip.h b/chrome/browser/ui/views/tabs/tab_strip.h
index 59d4029..49eca4d 100644
--- a/chrome/browser/ui/views/tabs/tab_strip.h
+++ b/chrome/browser/ui/views/tabs/tab_strip.h
@@ -670,7 +670,7 @@ class TabStrip : public views::View,
   bool immersive_style_;
 
   // Our observers.
-  typedef ObserverList<TabStripObserver> TabStripObservers;
+  typedef base::ObserverList<TabStripObserver> TabStripObservers;
   TabStripObservers observers_;
 
   DISALLOW_COPY_AND_ASSIGN(TabStrip);
diff --git a/chrome/browser/ui/views/toolbar/browser_actions_container.h b/chrome/browser/ui/views/toolbar/browser_actions_container.h
index 22a4377..23e4fa7 100644
--- a/chrome/browser/ui/views/toolbar/browser_actions_container.h
+++ b/chrome/browser/ui/views/toolbar/browser_actions_container.h
@@ -347,7 +347,7 @@ class BrowserActionsContainer
   // The extension bubble that is actively showing, if any.
   views::BubbleDelegateView* active_bubble_;
 
-  ObserverList<BrowserActionsContainerObserver> observers_;
+  base::ObserverList<BrowserActionsContainerObserver> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserActionsContainer);
 };
diff --git a/chrome/browser/ui/views/toolbar/toolbar_view.h b/chrome/browser/ui/views/toolbar/toolbar_view.h
index 7fd21e7..16631f9 100644
--- a/chrome/browser/ui/views/toolbar/toolbar_view.h
+++ b/chrome/browser/ui/views/toolbar/toolbar_view.h
@@ -247,7 +247,7 @@ class ToolbarView : public views::AccessiblePaneView,
   scoped_ptr<WrenchMenu> wrench_menu_;
 
   // A list of listeners to call when the menu opens.
-  ObserverList<views::MenuListener> menu_listeners_;
+  base::ObserverList<views::MenuListener> menu_listeners_;
 
   content::NotificationRegistrar registrar_;
 
diff --git a/chrome/browser/ui/views/toolbar/wrench_menu.h b/chrome/browser/ui/views/toolbar/wrench_menu.h
index d9f9fc6..2cb987c 100644
--- a/chrome/browser/ui/views/toolbar/wrench_menu.h
+++ b/chrome/browser/ui/views/toolbar/wrench_menu.h
@@ -187,7 +187,7 @@ class WrenchMenu : public views::MenuDelegate,
   // The bit mask of RunFlags.
   const int run_flags_;
 
-  ObserverList<WrenchMenuObserver> observer_list_;
+  base::ObserverList<WrenchMenuObserver> observer_list_;
 
   // Records the time from when menu opens to when the user selects a menu item.
   base::ElapsedTimer menu_opened_timer_;
diff --git a/chrome/browser/ui/views/website_settings/permission_selector_view.h b/chrome/browser/ui/views/website_settings/permission_selector_view.h
index afcde26..20391ac 100644
--- a/chrome/browser/ui/views/website_settings/permission_selector_view.h
+++ b/chrome/browser/ui/views/website_settings/permission_selector_view.h
@@ -51,7 +51,7 @@ class PermissionSelectorView : public views::View {
   views::ImageView* icon_;  // Owned by the views hierachy.
   internal::PermissionMenuButton* menu_button_;  // Owned by the views hierachy.
 
-  ObserverList<PermissionSelectorViewObserver, false> observer_list_;
+  base::ObserverList<PermissionSelectorViewObserver, false> observer_list_;
 
   DISALLOW_COPY_AND_ASSIGN(PermissionSelectorView);
 };
diff --git a/chrome/browser/ui/webui/chromeos/login/network_dropdown_handler.h b/chrome/browser/ui/webui/chromeos/login/network_dropdown_handler.h
index 6aba30e..f4705c0 100644
--- a/chrome/browser/ui/webui/chromeos/login/network_dropdown_handler.h
+++ b/chrome/browser/ui/webui/chromeos/login/network_dropdown_handler.h
@@ -53,7 +53,7 @@ class NetworkDropdownHandler : public BaseScreenHandler,
 
   scoped_ptr<NetworkDropdown> dropdown_;
 
-  ObserverList<Observer> observers_;
+  base::ObserverList<Observer> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(NetworkDropdownHandler);
 };
diff --git a/chrome/browser/ui/webui/chromeos/login/network_state_informer.h b/chrome/browser/ui/webui/chromeos/login/network_state_informer.h
index 7f843ed..23b75ed 100644
--- a/chrome/browser/ui/webui/chromeos/login/network_state_informer.h
+++ b/chrome/browser/ui/webui/chromeos/login/network_state_informer.h
@@ -98,7 +98,7 @@ class NetworkStateInformer
   std::string network_path_;
   std::string network_type_;
 
-  ObserverList<NetworkStateInformerObserver> observers_;
+  base::ObserverList<NetworkStateInformerObserver> observers_;
   content::NotificationRegistrar registrar_;
 
   base::WeakPtrFactory<NetworkStateInformer> weak_ptr_factory_;
diff --git a/chrome/browser/ui/webui/chromeos/login/oobe_ui.h b/chrome/browser/ui/webui/chromeos/login/oobe_ui.h
index 45b05aa..bb1d096 100644
--- a/chrome/browser/ui/webui/chromeos/login/oobe_ui.h
+++ b/chrome/browser/ui/webui/chromeos/login/oobe_ui.h
@@ -255,7 +255,7 @@ class OobeUI : public OobeDisplay,
   std::vector<base::Closure> ready_callbacks_;
 
   // List of registered observers.
-  ObserverList<Observer> observer_list_;
+  base::ObserverList<Observer> observer_list_;
 
   // Observer of CrosSettings watching the kRebootOnShutdown policy.
   scoped_ptr<ShutdownPolicyHandler> shutdown_policy_handler_;
diff --git a/chrome/browser/ui/webui/chromeos/touch_view_controller_delegate.h b/chrome/browser/ui/webui/chromeos/touch_view_controller_delegate.h
index e0497c4..037fa35 100644
--- a/chrome/browser/ui/webui/chromeos/touch_view_controller_delegate.h
+++ b/chrome/browser/ui/webui/chromeos/touch_view_controller_delegate.h
@@ -42,7 +42,7 @@ class TouchViewControllerDelegate : public ash::ShellObserver {
   void OnMaximizeModeEnded() override;
 
   // Mode state change observers.
-  ObserverList<Observer> observers_;
+  base::ObserverList<Observer> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(TouchViewControllerDelegate);
 };
diff --git a/chrome/browser/ui/webui/media_router/query_result_manager.h b/chrome/browser/ui/webui/media_router/query_result_manager.h
index 3f51aa2..abe6e00 100644
--- a/chrome/browser/ui/webui/media_router/query_result_manager.h
+++ b/chrome/browser/ui/webui/media_router/query_result_manager.h
@@ -133,7 +133,7 @@ class QueryResultManager {
   std::map<MediaSinkId, MediaSinkWithCastModes> all_sinks_;
 
   // Registered observers.
-  ObserverList<Observer> observers_;
+  base::ObserverList<Observer> observers_;
 
   // Not owned by this object.
   MediaRouter* router_;
diff --git a/chrome/browser/ui/webui/signin/login_ui_service.h b/chrome/browser/ui/webui/signin/login_ui_service.h
index aa56461..d15efe7 100644
--- a/chrome/browser/ui/webui/signin/login_ui_service.h
+++ b/chrome/browser/ui/webui/signin/login_ui_service.h
@@ -97,7 +97,7 @@ class LoginUIService : public KeyedService {
   Profile* profile_;
 
   // List of observers.
-  ObserverList<Observer> observer_list_;
+  base::ObserverList<Observer> observer_list_;
 
   base::string16 last_login_result_;