Replace more ObserverList with base::ObserverList.

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

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

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

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

375 files changed, 483 insertions, 461 deletions

diff --git a/android_webview/browser/aw_pref_store.h b/android_webview/browser/aw_pref_store.h
index a0d263b..855873b 100644
--- a/android_webview/browser/aw_pref_store.h
+++ b/android_webview/browser/aw_pref_store.h
@@ -53,7 +53,7 @@ class AwPrefStore : public PersistentPrefStore {
   // Stores the preference values.
   PrefValueMap prefs_;
 
-  ObserverList<PrefStore::Observer, true> observers_;
+  base::ObserverList<PrefStore::Observer, true> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(AwPrefStore);
 };
diff --git a/apps/app_lifetime_monitor.h b/apps/app_lifetime_monitor.h
index 90ae2a8..dd2d793 100644
--- a/apps/app_lifetime_monitor.h
+++ b/apps/app_lifetime_monitor.h
@@ -81,7 +81,7 @@ class AppLifetimeMonitor : public KeyedService,
 
   content::NotificationRegistrar registrar_;
   Profile* profile_;
-  ObserverList<Observer> observers_;
+  base::ObserverList<Observer> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(AppLifetimeMonitor);
 };
diff --git a/ash/content/display/screen_orientation_controller_chromeos.h b/ash/content/display/screen_orientation_controller_chromeos.h
index 0a84b8c..93ac053 100644
--- a/ash/content/display/screen_orientation_controller_chromeos.h
+++ b/ash/content/display/screen_orientation_controller_chromeos.h
@@ -179,7 +179,7 @@ class ASH_EXPORT ScreenOrientationController
   gfx::Display::Rotation current_rotation_;
 
   // Rotation Lock observers.
-  ObserverList<Observer> observers_;
+  base::ObserverList<Observer> observers_;
 
   // Tracks all windows that have requested a lock, as well as the requested
   // orientation.
diff --git a/ash/desktop_background/desktop_background_controller.h b/ash/desktop_background/desktop_background_controller.h
index ba865fd..ebebeaa 100644
--- a/ash/desktop_background/desktop_background_controller.h
+++ b/ash/desktop_background/desktop_background_controller.h
@@ -148,7 +148,7 @@ class ASH_EXPORT DesktopBackgroundController
 
   SkColor background_color_;
 
-  ObserverList<DesktopBackgroundControllerObserver> observers_;
+  base::ObserverList<DesktopBackgroundControllerObserver> observers_;
 
   // The current wallpaper.
   scoped_ptr<wallpaper::WallpaperResizer> current_wallpaper_;
diff --git a/ash/display/display_controller.h b/ash/display/display_controller.h
index bb476ef..40e3ed2 100644
--- a/ash/display/display_controller.h
+++ b/ash/display/display_controller.h
@@ -207,7 +207,7 @@ class ASH_EXPORT DisplayController : public gfx::DisplayObserver,
   // The mapping from display ID to its window tree host.
   WindowTreeHostMap window_tree_hosts_;
 
-  ObserverList<Observer> observers_;
+  base::ObserverList<Observer> observers_;
 
   // Store the primary window tree host temporarily while replacing
   // display.
diff --git a/ash/display/screen_ash.h b/ash/display/screen_ash.h
index d30ad36..8139bf3f 100644
--- a/ash/display/screen_ash.h
+++ b/ash/display/screen_ash.h
@@ -52,7 +52,7 @@ class ASH_EXPORT ScreenAsh : public gfx::Screen {
   // It simply has a copy of the displays.
   gfx::Screen* CloneForShutdown();
 
-  ObserverList<gfx::DisplayObserver> observers_;
+  base::ObserverList<gfx::DisplayObserver> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(ScreenAsh);
 };
diff --git a/ash/first_run/first_run_helper.h b/ash/first_run/first_run_helper.h
index 42bc697..a2b1508 100644
--- a/ash/first_run/first_run_helper.h
+++ b/ash/first_run/first_run_helper.h
@@ -71,10 +71,10 @@ class ASH_EXPORT FirstRunHelper {
   virtual gfx::Rect GetHelpButtonBounds() = 0;
 
  protected:
-  ObserverList<Observer>& observers() { return observers_; }
+  base::ObserverList<Observer>& observers() { return observers_; }
 
  private:
-  ObserverList<Observer> observers_;
+  base::ObserverList<Observer> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(FirstRunHelper);
 };
diff --git a/ash/shelf/shelf_button.cc b/ash/shelf/shelf_button.cc
index 388bf48..a6dc835 100644
--- a/ash/shelf/shelf_button.cc
+++ b/ash/shelf/shelf_button.cc
@@ -98,7 +98,7 @@ class ShelfButtonAnimation : public gfx::AnimationDelegate {
   }
 
   gfx::ThrobAnimation animation_;
-  ObserverList<Observer> observers_;
+  base::ObserverList<Observer> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(ShelfButtonAnimation);
 };
diff --git a/ash/shelf/shelf_item_delegate_manager.h b/ash/shelf/shelf_item_delegate_manager.h
index d2e77b9..b19b3a5 100644
--- a/ash/shelf/shelf_item_delegate_manager.h
+++ b/ash/shelf/shelf_item_delegate_manager.h
@@ -75,7 +75,7 @@ class ASH_EXPORT ShelfItemDelegateManager : public ShelfModelObserver {
 
   ShelfIDToItemDelegateMap id_to_item_delegate_map_;
 
-  ObserverList<ShelfItemDelegateManagerObserver> observers_;
+  base::ObserverList<ShelfItemDelegateManagerObserver> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(ShelfItemDelegateManager);
 };
diff --git a/ash/shelf/shelf_layout_manager.h b/ash/shelf/shelf_layout_manager.h
index 96f405e..240e765 100644
--- a/ash/shelf/shelf_layout_manager.h
+++ b/ash/shelf/shelf_layout_manager.h
@@ -376,7 +376,7 @@ class ASH_EXPORT ShelfLayoutManager
   // EventFilter used to detect when user issues a gesture on a bezel sensor.
   scoped_ptr<ShelfBezelEventFilter> bezel_event_filter_;
 
-  ObserverList<ShelfLayoutManagerObserver> observers_;
+  base::ObserverList<ShelfLayoutManagerObserver> observers_;
 
   // The shelf reacts to gesture-drags, and can be set to auto-hide for certain
   // gestures. Some shelf behaviour (e.g. visibility state, background color
diff --git a/ash/shelf/shelf_model.h b/ash/shelf/shelf_model.h
index 3b57c2a..8c683c6 100644
--- a/ash/shelf/shelf_model.h
+++ b/ash/shelf/shelf_model.h
@@ -91,7 +91,7 @@ class ASH_EXPORT ShelfModel {
 
   ShelfItems items_;
   Status status_;
-  ObserverList<ShelfModelObserver> observers_;
+  base::ObserverList<ShelfModelObserver> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(ShelfModel);
 };
diff --git a/ash/shelf/shelf_view.h b/ash/shelf/shelf_view.h
index 2bfb4fa..82ea7fa 100644
--- a/ash/shelf/shelf_view.h
+++ b/ash/shelf/shelf_view.h
@@ -372,7 +372,7 @@ class ASH_EXPORT ShelfView : public views::View,
 
   scoped_ptr<views::MenuRunner> launcher_menu_runner_;
 
-  ObserverList<ShelfIconObserver> observers_;
+  base::ObserverList<ShelfIconObserver> observers_;
 
   // Amount content is inset on the left edge (or top edge for vertical
   // alignment).
diff --git a/ash/shell.h b/ash/shell.h
index cb46540..41af348 100644
--- a/ash/shell.h
+++ b/ash/shell.h
@@ -757,7 +757,7 @@ class ASH_EXPORT Shell : public SystemModalContainerEventFilterDelegate,
   ::wm::CursorManager cursor_manager_;
 #endif  // defined(OS_CHROMEOS)
 
-  ObserverList<ShellObserver> observers_;
+  base::ObserverList<ShellObserver> observers_;
 
   // For testing only: simulate that a modal window is open
   bool simulate_modal_window_open_for_testing_;
diff --git a/ash/system/chromeos/network/vpn_delegate.h b/ash/system/chromeos/network/vpn_delegate.h
index b614ce2..aaf76a3 100644
--- a/ash/system/chromeos/network/vpn_delegate.h
+++ b/ash/system/chromeos/network/vpn_delegate.h
@@ -91,7 +91,7 @@ class ASH_EXPORT VPNDelegate {
   void NotifyObservers();
 
  private:
-  ObserverList<Observer, true> observer_list_;
+  base::ObserverList<Observer, true> observer_list_;
 
   DISALLOW_COPY_AND_ASSIGN(VPNDelegate);
 };
diff --git a/ash/system/chromeos/power/power_status.h b/ash/system/chromeos/power/power_status.h
index 8397e66..8cf2933 100644
--- a/ash/system/chromeos/power/power_status.h
+++ b/ash/system/chromeos/power/power_status.h
@@ -139,7 +139,7 @@ class ASH_EXPORT PowerStatus : public chromeos::PowerManagerClient::Observer {
   // Overriden from PowerManagerClient::Observer.
   void PowerChanged(const power_manager::PowerSupplyProperties& proto) override;
 
-  ObserverList<Observer> observers_;
+  base::ObserverList<Observer> observers_;
 
   // Current state.
   power_manager::PowerSupplyProperties proto_;
diff --git a/ash/system/tray/system_tray_notifier.h b/ash/system/tray/system_tray_notifier.h
index 29bba2a..b46cb9a 100644
--- a/ash/system/tray/system_tray_notifier.h
+++ b/ash/system/tray/system_tray_notifier.h
@@ -150,27 +150,28 @@ class ASH_EXPORT SystemTrayNotifier {
 #endif
 
  private:
-  ObserverList<AccessibilityObserver> accessibility_observers_;
-  ObserverList<AudioObserver> audio_observers_;
-  ObserverList<BluetoothObserver> bluetooth_observers_;
-  ObserverList<ClockObserver> clock_observers_;
-  ObserverList<IMEObserver> ime_observers_;
-  ObserverList<LocaleObserver> locale_observers_;
-  ObserverList<TracingObserver> tracing_observers_;
-  ObserverList<UpdateObserver> update_observers_;
-  ObserverList<UserObserver> user_observers_;
+  base::ObserverList<AccessibilityObserver> accessibility_observers_;
+  base::ObserverList<AudioObserver> audio_observers_;
+  base::ObserverList<BluetoothObserver> bluetooth_observers_;
+  base::ObserverList<ClockObserver> clock_observers_;
+  base::ObserverList<IMEObserver> ime_observers_;
+  base::ObserverList<LocaleObserver> locale_observers_;
+  base::ObserverList<TracingObserver> tracing_observers_;
+  base::ObserverList<UpdateObserver> update_observers_;
+  base::ObserverList<UserObserver> user_observers_;
 #if defined(OS_CHROMEOS)
-  ObserverList<LogoutButtonObserver> logout_button_observers_;
-  ObserverList<SessionLengthLimitObserver> session_length_limit_observers_;
-  ObserverList<NetworkObserver> network_observers_;
-  ObserverList<NetworkPortalDetectorObserver>
+  base::ObserverList<LogoutButtonObserver> logout_button_observers_;
+  base::ObserverList<SessionLengthLimitObserver>
+      session_length_limit_observers_;
+  base::ObserverList<NetworkObserver> network_observers_;
+  base::ObserverList<NetworkPortalDetectorObserver>
       network_portal_detector_observers_;
-  ObserverList<EnterpriseDomainObserver> enterprise_domain_observers_;
-  ObserverList<MediaCaptureObserver> media_capture_observers_;
-  ObserverList<ScreenCaptureObserver> screen_capture_observers_;
-  ObserverList<ScreenShareObserver> screen_share_observers_;
-  ObserverList<LastWindowClosedObserver> last_window_closed_observers_;
-  ObserverList<VirtualKeyboardObserver> virtual_keyboard_observers_;
+  base::ObserverList<EnterpriseDomainObserver> enterprise_domain_observers_;
+  base::ObserverList<MediaCaptureObserver> media_capture_observers_;
+  base::ObserverList<ScreenCaptureObserver> screen_capture_observers_;
+  base::ObserverList<ScreenShareObserver> screen_share_observers_;
+  base::ObserverList<LastWindowClosedObserver> last_window_closed_observers_;
+  base::ObserverList<VirtualKeyboardObserver> virtual_keyboard_observers_;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(SystemTrayNotifier);
diff --git a/ash/system/user/user_accounts_delegate.h b/ash/system/user/user_accounts_delegate.h
index 2c42843..e25e291 100644
--- a/ash/system/user/user_accounts_delegate.h
+++ b/ash/system/user/user_accounts_delegate.h
@@ -55,7 +55,7 @@ class ASH_EXPORT UserAccountsDelegate {
   void NotifyAccountListChanged();
 
  private:
-  ObserverList<Observer> observers_;
+  base::ObserverList<Observer> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(UserAccountsDelegate);
 };
diff --git a/ash/test/test_shell_delegate.h b/ash/test/test_shell_delegate.h
index 9b273fc..06ac471 100644
--- a/ash/test/test_shell_delegate.h
+++ b/ash/test/test_shell_delegate.h
@@ -76,7 +76,8 @@ class TestShellDelegate : public ShellDelegate {
   scoped_ptr<content::BrowserContext> active_browser_context_;
   scoped_ptr<app_list::AppListViewDelegate> app_list_view_delegate_;
 
-  ObserverList<ash::VirtualKeyboardStateObserver> keyboard_state_observer_list_;
+  base::ObserverList<ash::VirtualKeyboardStateObserver>
+      keyboard_state_observer_list_;
 
   TestSessionStateDelegate* test_session_state_delegate_;  // Not owned.
 
diff --git a/ash/wm/dock/docked_window_layout_manager.h b/ash/wm/dock/docked_window_layout_manager.h
index aad8804..c2a2afa 100644
--- a/ash/wm/dock/docked_window_layout_manager.h
+++ b/ash/wm/dock/docked_window_layout_manager.h
@@ -324,7 +324,7 @@ class ASH_EXPORT DockedWindowLayoutManager
   scoped_ptr<DockedBackgroundWidget> background_widget_;
 
   // Observers of dock bounds changes.
-  ObserverList<DockedWindowLayoutManagerObserver> observer_list_;
+  base::ObserverList<DockedWindowLayoutManagerObserver> observer_list_;
 
   DISALLOW_COPY_AND_ASSIGN(DockedWindowLayoutManager);
 };
diff --git a/ash/wm/lock_state_controller.h b/ash/wm/lock_state_controller.h
index 035797a..df92f94 100644
--- a/ash/wm/lock_state_controller.h
+++ b/ash/wm/lock_state_controller.h
@@ -283,7 +283,7 @@ class ASH_EXPORT LockStateController : public aura::WindowTreeHostObserver,
 
   scoped_ptr<LockStateControllerDelegate> delegate_;
 
-  ObserverList<LockStateObserver> observers_;
+  base::ObserverList<LockStateObserver> observers_;
 
   // The current login status, or original login status from before we locked.
   user::LoginStatus login_status_;
diff --git a/ash/wm/video_detector.h b/ash/wm/video_detector.h
index 0735b09..ca1a3e5 100644
--- a/ash/wm/video_detector.h
+++ b/ash/wm/video_detector.h
@@ -88,7 +88,7 @@ class ASH_EXPORT VideoDetector : public aura::EnvObserver,
   // Maps from a window that we're tracking to information about it.
   WindowInfoMap window_infos_;
 
-  ObserverList<VideoDetectorObserver> observers_;
+  base::ObserverList<VideoDetectorObserver> observers_;
 
   // Last time at which we notified observers that a video was playing.
   base::TimeTicks last_observer_notification_time_;
diff --git a/ash/wm/window_state.h b/ash/wm/window_state.h
index cc46273..f74d9be 100644
--- a/ash/wm/window_state.h
+++ b/ash/wm/window_state.h
@@ -370,7 +370,7 @@ class ASH_EXPORT WindowState : public aura::WindowObserver {
   // restored when only this one window gets shown.
   scoped_ptr<gfx::Rect> pre_auto_manage_window_bounds_;
 
-  ObserverList<WindowStateObserver> observer_list_;
+  base::ObserverList<WindowStateObserver> observer_list_;
 
   // True to ignore a property change event to avoid reentrance in
   // UpdateWindowStateType()
diff --git a/cc/animation/layer_animation_controller.h b/cc/animation/layer_animation_controller.h
index 1ac76fa..4b37ad4 100644
--- a/cc/animation/layer_animation_controller.h
+++ b/cc/animation/layer_animation_controller.h
@@ -215,8 +215,8 @@ class CC_EXPORT LayerAnimationController
 
   base::TimeTicks last_tick_time_;
 
-  ObserverList<LayerAnimationValueObserver> value_observers_;
-  ObserverList<LayerAnimationEventObserver> event_observers_;
+  base::ObserverList<LayerAnimationValueObserver> value_observers_;
+  base::ObserverList<LayerAnimationEventObserver> event_observers_;
 
   LayerAnimationValueProvider* value_provider_;
 
diff --git a/cc/surfaces/surface_manager.h b/cc/surfaces/surface_manager.h
index f088d16..aaaa444 100644
--- a/cc/surfaces/surface_manager.h
+++ b/cc/surfaces/surface_manager.h
@@ -60,7 +60,7 @@ class CC_SURFACES_EXPORT SurfaceManager {
 
   typedef base::hash_map<SurfaceId, Surface*> SurfaceMap;
   SurfaceMap surface_map_;
-  ObserverList<SurfaceDamageObserver> observer_list_;
+  base::ObserverList<SurfaceDamageObserver> observer_list_;
   base::ThreadChecker thread_checker_;
 
   // List of surfaces to be destroyed, along with what sequences they're still
diff --git a/chromeos/accelerometer/accelerometer_reader.cc b/chromeos/accelerometer/accelerometer_reader.cc
index fe8422c..a89cdd6 100644
--- a/chromeos/accelerometer/accelerometer_reader.cc
+++ b/chromeos/accelerometer/accelerometer_reader.cc
@@ -212,7 +212,7 @@ void AccelerometerReader::RemoveObserver(Observer* observer) {
 
 AccelerometerReader::AccelerometerReader()
     : configuration_(new AccelerometerReader::Configuration()),
-      observers_(new ObserverListThreadSafe<Observer>()),
+      observers_(new base::ObserverListThreadSafe<Observer>()),
       weak_factory_(this) {
 }
 
diff --git a/chromeos/accelerometer/accelerometer_reader.h b/chromeos/accelerometer/accelerometer_reader.h
index 29e4e95..f0e385b 100644
--- a/chromeos/accelerometer/accelerometer_reader.h
+++ b/chromeos/accelerometer/accelerometer_reader.h
@@ -97,7 +97,7 @@ class CHROMEOS_EXPORT AccelerometerReader {
   // The accelerometer configuration.
   scoped_refptr<Configuration> configuration_;
 
-  scoped_refptr<ObserverListThreadSafe<Observer>> observers_;
+  scoped_refptr<base::ObserverListThreadSafe<Observer>> observers_;
 
   base::WeakPtrFactory<AccelerometerReader> weak_factory_;
 
diff --git a/chromeos/audio/audio_devices_pref_handler_impl.h b/chromeos/audio/audio_devices_pref_handler_impl.h
index ef22b69..aeb9f3e 100644
--- a/chromeos/audio/audio_devices_pref_handler_impl.h
+++ b/chromeos/audio/audio_devices_pref_handler_impl.h
@@ -76,7 +76,7 @@ class CHROMEOS_EXPORT AudioDevicesPrefHandlerImpl
   PrefService* local_state_;  // not owned
 
   PrefChangeRegistrar pref_change_registrar_;
-  ObserverList<AudioPrefObserver> observers_;
+  base::ObserverList<AudioPrefObserver> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(AudioDevicesPrefHandlerImpl);
 };
diff --git a/chromeos/audio/cras_audio_handler.h b/chromeos/audio/cras_audio_handler.h
index e16ab84..633e30a 100644
--- a/chromeos/audio/cras_audio_handler.h
+++ b/chromeos/audio/cras_audio_handler.h
@@ -306,7 +306,7 @@ class CHROMEOS_EXPORT CrasAudioHandler : public CrasAudioClient::Observer,
   void NotifyActiveNodeChanged(bool is_input);
 
   scoped_refptr<AudioDevicesPrefHandler> audio_pref_handler_;
-  ObserverList<AudioObserver> observers_;
+  base::ObserverList<AudioObserver> observers_;
 
   // Audio data and state.
   AudioDeviceMap audio_devices_;
diff --git a/chromeos/cert_loader.h b/chromeos/cert_loader.h
index 9283918..694ea31 100644
--- a/chromeos/cert_loader.h
+++ b/chromeos/cert_loader.h
@@ -108,7 +108,7 @@ class CHROMEOS_EXPORT CertLoader : public net::CertDatabase::Observer {
   void OnCertAdded(const net::X509Certificate* cert) override;
   void OnCertRemoved(const net::X509Certificate* cert) override;
 
-  ObserverList<Observer> observers_;
+  base::ObserverList<Observer> observers_;
 
   // Flags describing current CertLoader state.
   bool certificates_loaded_;
diff --git a/chromeos/dbus/amplifier_client.cc b/chromeos/dbus/amplifier_client.cc
index d1af700..5a3ffa6 100644
--- a/chromeos/dbus/amplifier_client.cc
+++ b/chromeos/dbus/amplifier_client.cc
@@ -86,7 +86,7 @@ class AmplifierClientImpl : public AmplifierClient {
   bool signal_connected_;
 
   // List of observers interested in event notifications from us.
-  ObserverList<Observer> observers_;
+  base::ObserverList<Observer> observers_;
 
   // Note: This should remain the last member so it'll be destroyed and
   // invalidate its weak pointers before any other members are destroyed.
diff --git a/chromeos/dbus/ap_manager_client.cc b/chromeos/dbus/ap_manager_client.cc
index 831abd8..35c1af5 100644
--- a/chromeos/dbus/ap_manager_client.cc
+++ b/chromeos/dbus/ap_manager_client.cc
@@ -111,7 +111,7 @@ class ApManagerClientImpl : public ApManagerClient,
                         dbus::Response* response);
 
   // List of observers interested in event notifications from us.
-  ObserverList<Observer> observers_;
+  base::ObserverList<Observer> observers_;
   dbus::ObjectManager* object_manager_;
   base::WeakPtrFactory<ApManagerClientImpl> weak_ptr_factory_;
 
diff --git a/chromeos/dbus/audio_dsp_client.cc b/chromeos/dbus/audio_dsp_client.cc
index 19fce6b..74a8dcd 100644
--- a/chromeos/dbus/audio_dsp_client.cc
+++ b/chromeos/dbus/audio_dsp_client.cc
@@ -160,7 +160,7 @@ class AudioDspClientImpl : public AudioDspClient {
   bool signal_connected_;
 
   // List of observers interested in event notifications from us.
-  ObserverList<Observer> observers_;
+  base::ObserverList<Observer> observers_;
 
   // Note: This should remain the last member so it'll be destroyed and
   // invalidate its weak pointers before any other members are destroyed.
diff --git a/chromeos/dbus/bluetooth_adapter_client.cc b/chromeos/dbus/bluetooth_adapter_client.cc
index 7294ac4..741dc03 100644
--- a/chromeos/dbus/bluetooth_adapter_client.cc
+++ b/chromeos/dbus/bluetooth_adapter_client.cc
@@ -344,7 +344,7 @@ class BluetoothAdapterClientImpl
   dbus::ObjectManager* object_manager_;
 
   // List of observers interested in event notifications from us.
-  ObserverList<BluetoothAdapterClient::Observer> observers_;
+  base::ObserverList<BluetoothAdapterClient::Observer> observers_;
 
   // Weak pointer factory for generating 'this' pointers that might live longer
   // than we do.
diff --git a/chromeos/dbus/bluetooth_device_client.cc b/chromeos/dbus/bluetooth_device_client.cc
index 30e5a36..02a5c6b 100644
--- a/chromeos/dbus/bluetooth_device_client.cc
+++ b/chromeos/dbus/bluetooth_device_client.cc
@@ -376,7 +376,7 @@ class BluetoothDeviceClientImpl
   dbus::ObjectManager* object_manager_;
 
   // List of observers interested in event notifications from us.
-  ObserverList<BluetoothDeviceClient::Observer> observers_;
+  base::ObserverList<BluetoothDeviceClient::Observer> observers_;
 
   // Weak pointer factory for generating 'this' pointers that might live longer
   // than we do.
diff --git a/chromeos/dbus/bluetooth_gatt_characteristic_client.cc b/chromeos/dbus/bluetooth_gatt_characteristic_client.cc
index fda19ed..5e48601 100644
--- a/chromeos/dbus/bluetooth_gatt_characteristic_client.cc
+++ b/chromeos/dbus/bluetooth_gatt_characteristic_client.cc
@@ -299,7 +299,7 @@ class BluetoothGattCharacteristicClientImpl
   dbus::ObjectManager* object_manager_;
 
   // List of observers interested in event notifications from us.
-  ObserverList<BluetoothGattCharacteristicClient::Observer> observers_;
+  base::ObserverList<BluetoothGattCharacteristicClient::Observer> observers_;
 
   // Weak pointer factory for generating 'this' pointers that might live longer
   // than we do.
diff --git a/chromeos/dbus/bluetooth_gatt_descriptor_client.cc b/chromeos/dbus/bluetooth_gatt_descriptor_client.cc
index 65bba57..86d38ff 100644
--- a/chromeos/dbus/bluetooth_gatt_descriptor_client.cc
+++ b/chromeos/dbus/bluetooth_gatt_descriptor_client.cc
@@ -241,7 +241,7 @@ class BluetoothGattDescriptorClientImpl
   dbus::ObjectManager* object_manager_;
 
   // List of observers interested in event notifications from us.
-  ObserverList<BluetoothGattDescriptorClient::Observer> observers_;
+  base::ObserverList<BluetoothGattDescriptorClient::Observer> observers_;
 
   // Weak pointer factory for generating 'this' pointers that might live longer
   // than we do.
diff --git a/chromeos/dbus/bluetooth_gatt_service_client.cc b/chromeos/dbus/bluetooth_gatt_service_client.cc
index 77e14f3..58266c1 100644
--- a/chromeos/dbus/bluetooth_gatt_service_client.cc
+++ b/chromeos/dbus/bluetooth_gatt_service_client.cc
@@ -127,7 +127,7 @@ class BluetoothGattServiceClientImpl : public BluetoothGattServiceClient,
   dbus::ObjectManager* object_manager_;
 
   // List of observers interested in event notifications from us.
-  ObserverList<BluetoothGattServiceClient::Observer> observers_;
+  base::ObserverList<BluetoothGattServiceClient::Observer> observers_;
 
   // Weak pointer factory for generating 'this' pointers that might live longer
   // than we do.
diff --git a/chromeos/dbus/bluetooth_input_client.cc b/chromeos/dbus/bluetooth_input_client.cc
index 3803181..61ff6ed 100644
--- a/chromeos/dbus/bluetooth_input_client.cc
+++ b/chromeos/dbus/bluetooth_input_client.cc
@@ -113,7 +113,7 @@ class BluetoothInputClientImpl
   dbus::ObjectManager* object_manager_;
 
   // List of observers interested in event notifications from us.
-  ObserverList<BluetoothInputClient::Observer> observers_;
+  base::ObserverList<BluetoothInputClient::Observer> observers_;
 
   // Weak pointer factory for generating 'this' pointers that might live longer
   // than we do.
diff --git a/chromeos/dbus/bluetooth_le_advertising_manager_client.cc b/chromeos/dbus/bluetooth_le_advertising_manager_client.cc
index aa90b94..c798175 100644
--- a/chromeos/dbus/bluetooth_le_advertising_manager_client.cc
+++ b/chromeos/dbus/bluetooth_le_advertising_manager_client.cc
@@ -165,7 +165,7 @@ class BluetoothAdvertisementManagerClientImpl
   dbus::ObjectManager* object_manager_;
 
   // List of observers interested in event notifications from us.
-  ObserverList<BluetoothLEAdvertisingManagerClient::Observer> observers_;
+  base::ObserverList<BluetoothLEAdvertisingManagerClient::Observer> observers_;
 
   // Weak pointer factory for generating 'this' pointers that might live longer
   // than we do.
diff --git a/chromeos/dbus/bluetooth_media_client.cc b/chromeos/dbus/bluetooth_media_client.cc
index 0bdca3f..5922753 100644
--- a/chromeos/dbus/bluetooth_media_client.cc
+++ b/chromeos/dbus/bluetooth_media_client.cc
@@ -215,7 +215,7 @@ class BluetoothMediaClientImpl
   dbus::ObjectManager* object_manager_;
 
   // List of observers interested in event notifications from us.
-  ObserverList<BluetoothMediaClient::Observer> observers_;
+  base::ObserverList<BluetoothMediaClient::Observer> observers_;
 
   base::WeakPtrFactory<BluetoothMediaClientImpl> weak_ptr_factory_;
 
diff --git a/chromeos/dbus/bluetooth_media_transport_client.cc b/chromeos/dbus/bluetooth_media_transport_client.cc
index 9851cbc..5639930 100644
--- a/chromeos/dbus/bluetooth_media_transport_client.cc
+++ b/chromeos/dbus/bluetooth_media_transport_client.cc
@@ -280,7 +280,7 @@ class BluetoothMediaTransportClientImpl
   dbus::ObjectManager* object_manager_;
 
   // List of observers interested in event notifications from us.
-  ObserverList<BluetoothMediaTransportClient::Observer> observers_;
+  base::ObserverList<BluetoothMediaTransportClient::Observer> observers_;
 
   base::WeakPtrFactory<BluetoothMediaTransportClientImpl> weak_ptr_factory_;
 
diff --git a/chromeos/dbus/cras_audio_client.cc b/chromeos/dbus/cras_audio_client.cc
index e70ba2a..29e2653 100644
--- a/chromeos/dbus/cras_audio_client.cc
+++ b/chromeos/dbus/cras_audio_client.cc
@@ -415,7 +415,7 @@ class CrasAudioClientImpl : public CrasAudioClient {
   }
 
   dbus::ObjectProxy* cras_proxy_;
-  ObserverList<Observer> observers_;
+  base::ObserverList<Observer> observers_;
 
   // Note: This should remain the last member so it'll be destroyed and
   // invalidate its weak pointers before any other members are destroyed.
diff --git a/chromeos/dbus/fake_bluetooth_adapter_client.h b/chromeos/dbus/fake_bluetooth_adapter_client.h
index 54a6dbd..987fc6f 100644
--- a/chromeos/dbus/fake_bluetooth_adapter_client.h
+++ b/chromeos/dbus/fake_bluetooth_adapter_client.h
@@ -90,7 +90,7 @@ class CHROMEOS_EXPORT FakeBluetoothAdapterClient
   void PostDelayedTask(const base::Closure& callback);
 
   // List of observers interested in event notifications from us.
-  ObserverList<Observer> observers_;
+  base::ObserverList<Observer> observers_;
 
   // Static properties we return.
   scoped_ptr<Properties> properties_;
diff --git a/chromeos/dbus/fake_bluetooth_device_client.h b/chromeos/dbus/fake_bluetooth_device_client.h
index 71c42e2..a9e6c19 100644
--- a/chromeos/dbus/fake_bluetooth_device_client.h
+++ b/chromeos/dbus/fake_bluetooth_device_client.h
@@ -244,7 +244,7 @@ class CHROMEOS_EXPORT FakeBluetoothDeviceClient
       BluetoothProfileServiceProvider::Delegate::Status status);
 
   // List of observers interested in event notifications from us.
-  ObserverList<Observer> observers_;
+  base::ObserverList<Observer> observers_;
 
   // Static properties we return.
   typedef std::map<const dbus::ObjectPath, Properties *> PropertiesMap;
diff --git a/chromeos/dbus/fake_bluetooth_gatt_characteristic_client.h b/chromeos/dbus/fake_bluetooth_gatt_characteristic_client.h
index 3934a4c..8366169 100644
--- a/chromeos/dbus/fake_bluetooth_gatt_characteristic_client.h
+++ b/chromeos/dbus/fake_bluetooth_gatt_characteristic_client.h
@@ -178,7 +178,7 @@ class CHROMEOS_EXPORT FakeBluetoothGattCharacteristicClient
   std::map<std::string, DelayedCallback*> action_extra_requests_;
 
   // List of observers interested in event notifications from us.
-  ObserverList<Observer> observers_;
+  base::ObserverList<Observer> observers_;
 
   // Weak pointer factory for generating 'this' pointers that might live longer
   // than we do.
diff --git a/chromeos/dbus/fake_bluetooth_gatt_descriptor_client.h b/chromeos/dbus/fake_bluetooth_gatt_descriptor_client.h
index ce7cb67..fe405c7 100644
--- a/chromeos/dbus/fake_bluetooth_gatt_descriptor_client.h
+++ b/chromeos/dbus/fake_bluetooth_gatt_descriptor_client.h
@@ -87,7 +87,7 @@ class CHROMEOS_EXPORT FakeBluetoothGattDescriptorClient
   PropertiesMap properties_;
 
   // List of observers interested in event notifications from us.
-  ObserverList<Observer> observers_;
+  base::ObserverList<Observer> observers_;
 
   // Weak pointer factory for generating 'this' pointers that might live longer
   // than we do.
diff --git a/chromeos/dbus/fake_bluetooth_gatt_service_client.h b/chromeos/dbus/fake_bluetooth_gatt_service_client.h
index c963d04..f719727 100644
--- a/chromeos/dbus/fake_bluetooth_gatt_service_client.h
+++ b/chromeos/dbus/fake_bluetooth_gatt_service_client.h
@@ -90,7 +90,7 @@ class CHROMEOS_EXPORT FakeBluetoothGattServiceClient
   std::string heart_rate_service_path_;
 
   // List of observers interested in event notifications from us.
-  ObserverList<Observer> observers_;
+  base::ObserverList<Observer> observers_;
 
   // Weak pointer factory for generating 'this' pointers that might live longer
   // than we do.
diff --git a/chromeos/dbus/fake_bluetooth_input_client.h b/chromeos/dbus/fake_bluetooth_input_client.h
index 461c02c..56633ff 100644
--- a/chromeos/dbus/fake_bluetooth_input_client.h
+++ b/chromeos/dbus/fake_bluetooth_input_client.h
@@ -55,7 +55,7 @@ class CHROMEOS_EXPORT FakeBluetoothInputClient
   PropertiesMap properties_map_;
 
   // List of observers interested in event notifications from us.
-  ObserverList<Observer> observers_;
+  base::ObserverList<Observer> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(FakeBluetoothInputClient);
 };
diff --git a/chromeos/dbus/fake_bluetooth_media_client.h b/chromeos/dbus/fake_bluetooth_media_client.h
index c9649e6..3b4f4a7 100644
--- a/chromeos/dbus/fake_bluetooth_media_client.h
+++ b/chromeos/dbus/fake_bluetooth_media_client.h
@@ -66,7 +66,7 @@ class CHROMEOS_EXPORT FakeBluetoothMediaClient : public BluetoothMediaClient {
       endpoints_;
 
   // List of observers interested in event notifications from us.
-  ObserverList<BluetoothMediaClient::Observer> observers_;
+  base::ObserverList<BluetoothMediaClient::Observer> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(FakeBluetoothMediaClient);
 };
diff --git a/chromeos/dbus/fake_bluetooth_media_transport_client.h b/chromeos/dbus/fake_bluetooth_media_transport_client.h
index 997d28d..f1b2e53 100644
--- a/chromeos/dbus/fake_bluetooth_media_transport_client.h
+++ b/chromeos/dbus/fake_bluetooth_media_transport_client.h
@@ -138,7 +138,7 @@ class CHROMEOS_EXPORT FakeBluetoothMediaTransportClient
   // corresponding endpoint path when GetProperties() is called.
   std::map<dbus::ObjectPath, dbus::ObjectPath> transport_to_endpoint_map_;
 
-  ObserverList<BluetoothMediaTransportClient::Observer> observers_;
+  base::ObserverList<BluetoothMediaTransportClient::Observer> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(FakeBluetoothMediaTransportClient);
 };
diff --git a/chromeos/dbus/fake_cras_audio_client.h b/chromeos/dbus/fake_cras_audio_client.h
index 0ef79f4..ab5b9f7 100644
--- a/chromeos/dbus/fake_cras_audio_client.h
+++ b/chromeos/dbus/fake_cras_audio_client.h
@@ -50,7 +50,7 @@ class CHROMEOS_EXPORT FakeCrasAudioClient : public CrasAudioClient {
   AudioNodeList node_list_;
   uint64 active_input_node_id_;
   uint64 active_output_node_id_;
-  ObserverList<Observer> observers_;
+  base::ObserverList<Observer> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(FakeCrasAudioClient);
 };
diff --git a/chromeos/dbus/fake_nfc_adapter_client.h b/chromeos/dbus/fake_nfc_adapter_client.h
index 253ae6c..21e76bd 100644
--- a/chromeos/dbus/fake_nfc_adapter_client.h
+++ b/chromeos/dbus/fake_nfc_adapter_client.h
@@ -90,7 +90,7 @@ class CHROMEOS_EXPORT FakeNfcAdapterClient : public NfcAdapterClient {
                          const std::string& property_name);
 
   // List of observers interested in event notifications from us.
-  ObserverList<Observer> observers_;
+  base::ObserverList<Observer> observers_;
 
   // Fake properties that are returned for the emulated adapters.
   scoped_ptr<Properties> properties_;
diff --git a/chromeos/dbus/fake_nfc_device_client.h b/chromeos/dbus/fake_nfc_device_client.h
index a8d38e6..67d691c 100644
--- a/chromeos/dbus/fake_nfc_device_client.h
+++ b/chromeos/dbus/fake_nfc_device_client.h
@@ -106,7 +106,7 @@ class CHROMEOS_EXPORT FakeNfcDeviceClient : public NfcDeviceClient {
   void HandleSimulationTimeout();
 
   // List of observers interested in event notifications from us.
-  ObserverList<Observer> observers_;
+  base::ObserverList<Observer> observers_;
 
   // Fake properties that are returned for the emulated device.
   scoped_ptr<Properties> properties_;
diff --git a/chromeos/dbus/fake_nfc_manager_client.h b/chromeos/dbus/fake_nfc_manager_client.h
index 474738a..1f3f394 100644
--- a/chromeos/dbus/fake_nfc_manager_client.h
+++ b/chromeos/dbus/fake_nfc_manager_client.h
@@ -52,7 +52,7 @@ class CHROMEOS_EXPORT FakeNfcManagerClient : public NfcManagerClient {
   void OnPropertyChanged(const std::string& property_name);
 
   // List of observers interested in event notifications.
-  ObserverList<Observer> observers_;
+  base::ObserverList<Observer> observers_;
 
   // Set containing the currently simulated adapters.
   std::set<dbus::ObjectPath> adapters_;
diff --git a/chromeos/dbus/fake_nfc_record_client.h b/chromeos/dbus/fake_nfc_record_client.h
index c8cd209..daa6e07 100644
--- a/chromeos/dbus/fake_nfc_record_client.h
+++ b/chromeos/dbus/fake_nfc_record_client.h
@@ -75,7 +75,7 @@ class CHROMEOS_EXPORT FakeNfcRecordClient : public NfcRecordClient {
   bool tag_records_visible_;
 
   // List of observers interested in event notifications from us.
-  ObserverList<Observer> observers_;
+  base::ObserverList<Observer> observers_;
 
   // Fake properties that are returned for the fake records.
   scoped_ptr<Properties> device_smart_poster_record_properties_;
diff --git a/chromeos/dbus/fake_nfc_tag_client.h b/chromeos/dbus/fake_nfc_tag_client.h
index a2fdcbf..96f2ec8 100644
--- a/chromeos/dbus/fake_nfc_tag_client.h
+++ b/chromeos/dbus/fake_nfc_tag_client.h
@@ -96,7 +96,7 @@ class CHROMEOS_EXPORT FakeNfcTagClient : public NfcTagClient {
   void HandleSimulationTimeout();
 
   // List of observers interested in event notifications from us.
-  ObserverList<Observer> observers_;
+  base::ObserverList<Observer> observers_;
 
   // Fake properties that are returned for the emulated tag.
   scoped_ptr<Properties> properties_;
diff --git a/chromeos/dbus/fake_power_manager_client.h b/chromeos/dbus/fake_power_manager_client.h
index 604b345..d6cd042 100644
--- a/chromeos/dbus/fake_power_manager_client.h
+++ b/chromeos/dbus/fake_power_manager_client.h
@@ -72,7 +72,7 @@ class FakePowerManagerClient : public PowerManagerClient {
   // readiness.
   void HandleSuspendReadiness();
 
-  ObserverList<Observer> observers_;
+  base::ObserverList<Observer> observers_;
 
   // Last policy passed to SetPolicy().
   power_manager::PowerManagementPolicy policy_;
diff --git a/chromeos/dbus/fake_session_manager_client.h b/chromeos/dbus/fake_session_manager_client.h
index 5db16d7..ed4c5c1 100644
--- a/chromeos/dbus/fake_session_manager_client.h
+++ b/chromeos/dbus/fake_session_manager_client.h
@@ -102,7 +102,7 @@ class FakeSessionManagerClient : public SessionManagerClient {
   std::string device_policy_;
   std::map<std::string, std::string> user_policies_;
   std::map<std::string, std::string> device_local_account_policy_;
-  ObserverList<Observer> observers_;
+  base::ObserverList<Observer> observers_;
   SessionManagerClient::ActiveSessionsMap user_sessions_;
   std::vector<std::string> server_backed_state_keys_;
 
diff --git a/chromeos/dbus/fake_shill_manager_client.h b/chromeos/dbus/fake_shill_manager_client.h
index 61d1809..313a2d4 100644
--- a/chromeos/dbus/fake_shill_manager_client.h
+++ b/chromeos/dbus/fake_shill_manager_client.h
@@ -152,7 +152,7 @@ class CHROMEOS_EXPORT FakeShillManagerClient
   typedef std::map<std::string, ShillPropertyMap> DevicePropertyMap;
   DevicePropertyMap shill_device_property_map_;
 
-  ObserverList<ShillPropertyChangedObserver> observer_list_;
+  base::ObserverList<ShillPropertyChangedObserver> observer_list_;
 
   // Track the default service for signaling Manager.DefaultService.
   std::string default_service_;
diff --git a/chromeos/dbus/fake_update_engine_client.h b/chromeos/dbus/fake_update_engine_client.h
index 814be54..68c0aa4 100644
--- a/chromeos/dbus/fake_update_engine_client.h
+++ b/chromeos/dbus/fake_update_engine_client.h
@@ -76,7 +76,7 @@ class FakeUpdateEngineClient : public UpdateEngineClient {
   int can_rollback_call_count() const { return can_rollback_call_count_; }
 
  private:
-  ObserverList<Observer> observers_;
+  base::ObserverList<Observer> observers_;
   std::queue<UpdateEngineClient::Status> status_queue_;
   UpdateEngineClient::Status default_status_;
   UpdateEngineClient::UpdateCheckResult update_check_result_;
diff --git a/chromeos/dbus/leadership_daemon_manager_client.cc b/chromeos/dbus/leadership_daemon_manager_client.cc
index 9ad7f42..ed714e5 100644
--- a/chromeos/dbus/leadership_daemon_manager_client.cc
+++ b/chromeos/dbus/leadership_daemon_manager_client.cc
@@ -93,7 +93,7 @@ class LeadershipDaemonManagerClientImpl
                         dbus::Response* response);
 
   // List of observers interested in event notifications from us.
-  ObserverList<Observer> observers_;
+  base::ObserverList<Observer> observers_;
   dbus::ObjectManager* object_manager_;
   base::WeakPtrFactory<LeadershipDaemonManagerClientImpl> weak_ptr_factory_;
 
diff --git a/chromeos/dbus/metronome_client.cc b/chromeos/dbus/metronome_client.cc
index be3a8b6..e1e70dd 100644
--- a/chromeos/dbus/metronome_client.cc
+++ b/chromeos/dbus/metronome_client.cc
@@ -65,7 +65,7 @@ class MetronomeClientImpl : public MetronomeClient {
   bool signal_connected_;
 
   // List of observers interested in event notifications from us.
-  ObserverList<Observer> observers_;
+  base::ObserverList<Observer> observers_;
 
   // Note: This should remain the last member so it'll be destroyed and
   // invalidate its weak pointers before any other members are destroyed.
@@ -166,7 +166,7 @@ class MetronomeClientFakeImpl : public MetronomeClient {
   base::RepeatingTimer<MetronomeClientFakeImpl> beacon_timer_;
 
   // List of observers interested in event notifications from us.
-  ObserverList<Observer> observers_;
+  base::ObserverList<Observer> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(MetronomeClientFakeImpl);
 };
diff --git a/chromeos/dbus/nfc_adapter_client.cc b/chromeos/dbus/nfc_adapter_client.cc
index 3cd3664..4cde7c6 100644
--- a/chromeos/dbus/nfc_adapter_client.cc
+++ b/chromeos/dbus/nfc_adapter_client.cc
@@ -191,7 +191,7 @@ class NfcAdapterClientImpl
   dbus::Bus* bus_;
 
   // List of observers interested in event notifications.
-  ObserverList<NfcAdapterClient::Observer> observers_;
+  base::ObserverList<NfcAdapterClient::Observer> observers_;
 
   // Mapping from object paths to object proxies and properties structures that
   // were already created by us.
diff --git a/chromeos/dbus/nfc_device_client.cc b/chromeos/dbus/nfc_device_client.cc
index 8d185c2..c27396b 100644
--- a/chromeos/dbus/nfc_device_client.cc
+++ b/chromeos/dbus/nfc_device_client.cc
@@ -204,7 +204,7 @@ class NfcDeviceClientImpl : public NfcDeviceClient,
   dbus::Bus* bus_;
 
   // List of observers interested in event notifications.
-  ObserverList<NfcDeviceClient::Observer> observers_;
+  base::ObserverList<NfcDeviceClient::Observer> observers_;
 
   // Mapping from object paths to object proxies and properties structures that
   // were already created by us. This stucture stores a different DBusObjectMap
diff --git a/chromeos/dbus/nfc_manager_client.cc b/chromeos/dbus/nfc_manager_client.cc
index 53813f3..d35aadd 100644
--- a/chromeos/dbus/nfc_manager_client.cc
+++ b/chromeos/dbus/nfc_manager_client.cc
@@ -144,7 +144,7 @@ class NfcManagerClientImpl : public NfcManagerClient {
   scoped_ptr<Properties> properties_;
 
   // List of observers interested in event notifications.
-  ObserverList<NfcManagerClient::Observer> observers_;
+  base::ObserverList<NfcManagerClient::Observer> observers_;
 
   // Weak pointer factory for generating 'this' pointers that might live longer
   // than we do.
diff --git a/chromeos/dbus/nfc_record_client.cc b/chromeos/dbus/nfc_record_client.cc
index 5bd7a76..f462d69 100644
--- a/chromeos/dbus/nfc_record_client.cc
+++ b/chromeos/dbus/nfc_record_client.cc
@@ -244,7 +244,7 @@ class NfcRecordClientImpl : public NfcRecordClient,
   dbus::Bus* bus_;
 
   // List of observers interested in event notifications.
-  ObserverList<NfcRecordClient::Observer> observers_;
+  base::ObserverList<NfcRecordClient::Observer> observers_;
 
   // Mapping from object paths to object proxies and properties structures that
   // were already created by us. Record objects belong to either Tag or Device
diff --git a/chromeos/dbus/nfc_tag_client.cc b/chromeos/dbus/nfc_tag_client.cc
index 5db650a..adbe0ae 100644
--- a/chromeos/dbus/nfc_tag_client.cc
+++ b/chromeos/dbus/nfc_tag_client.cc
@@ -224,7 +224,7 @@ class NfcTagClientImpl : public NfcTagClient,
   dbus::Bus* bus_;
 
   // List of observers interested in event notifications.
-  ObserverList<NfcTagClient::Observer> observers_;
+  base::ObserverList<NfcTagClient::Observer> observers_;
 
   // Mapping from object paths to object proxies and properties structures that
   // were already created by us. This stucture stores a different DBusObjectMap
diff --git a/chromeos/dbus/peer_daemon_manager_client.cc b/chromeos/dbus/peer_daemon_manager_client.cc
index 9fdea05..b4d1acb 100644
--- a/chromeos/dbus/peer_daemon_manager_client.cc
+++ b/chromeos/dbus/peer_daemon_manager_client.cc
@@ -90,7 +90,7 @@ class PeerDaemonManagerClientImpl : public PeerDaemonManagerClient,
                              const std::string& property_name);
 
   // List of observers interested in event notifications from us.
-  ObserverList<Observer> observers_;
+  base::ObserverList<Observer> observers_;
   dbus::ObjectManager* object_manager_;
 
   base::WeakPtrFactory<PeerDaemonManagerClientImpl> weak_ptr_factory_;
diff --git a/chromeos/dbus/power_manager_client.cc b/chromeos/dbus/power_manager_client.cc
index 89d6113..a5d2322 100644
--- a/chromeos/dbus/power_manager_client.cc
+++ b/chromeos/dbus/power_manager_client.cc
@@ -728,7 +728,7 @@ class PowerManagerClientImpl : public PowerManagerClient {
   base::PlatformThreadId origin_thread_id_;
 
   dbus::ObjectProxy* power_manager_proxy_;
-  ObserverList<Observer> observers_;
+  base::ObserverList<Observer> observers_;
 
   // The delay_id_ obtained from the RegisterSuspendDelay request.
   int32_t suspend_delay_id_;
@@ -976,7 +976,7 @@ class PowerManagerClientStubImpl : public PowerManagerClient {
   double brightness_;
   int pause_count_;
   int cycle_count_;
-  ObserverList<Observer> observers_;
+  base::ObserverList<Observer> observers_;
   base::RepeatingTimer<PowerManagerClientStubImpl> update_timer_;
   power_manager::PowerSupplyProperties props_;
 
diff --git a/chromeos/dbus/privet_daemon_manager_client.cc b/chromeos/dbus/privet_daemon_manager_client.cc
index 4a39ebd..6decce8 100644
--- a/chromeos/dbus/privet_daemon_manager_client.cc
+++ b/chromeos/dbus/privet_daemon_manager_client.cc
@@ -70,7 +70,7 @@ class PrivetDaemonManagerClientImpl : public PrivetDaemonManagerClient,
                         dbus::Response* response);
 
   // List of observers interested in event notifications from us.
-  ObserverList<Observer> observers_;
+  base::ObserverList<Observer> observers_;
   dbus::ObjectManager* object_manager_;
   base::WeakPtrFactory<PrivetDaemonManagerClientImpl> weak_ptr_factory_;
 
diff --git a/chromeos/dbus/session_manager_client.cc b/chromeos/dbus/session_manager_client.cc
index 0854875..0e0d72a 100644
--- a/chromeos/dbus/session_manager_client.cc
+++ b/chromeos/dbus/session_manager_client.cc
@@ -633,7 +633,7 @@ class SessionManagerClientImpl : public SessionManagerClient {
 
   dbus::ObjectProxy* session_manager_proxy_;
   scoped_ptr<BlockingMethodCaller> blocking_method_caller_;
-  ObserverList<Observer> observers_;
+  base::ObserverList<Observer> observers_;
 
   // Most recent screen-lock state received from session_manager.
   bool screen_is_locked_;
@@ -798,7 +798,7 @@ class SessionManagerClientStubImpl : public SessionManagerClient {
 
  private:
   StubDelegate* delegate_;  // Weak pointer; may be NULL.
-  ObserverList<Observer> observers_;
+  base::ObserverList<Observer> observers_;
   std::string device_policy_;
   bool screen_is_locked_;
 
diff --git a/chromeos/dbus/shill_client_helper.h b/chromeos/dbus/shill_client_helper.h
index e2795e4..740a81c 100644
--- a/chromeos/dbus/shill_client_helper.h
+++ b/chromeos/dbus/shill_client_helper.h
@@ -175,7 +175,7 @@ class ShillClientHelper {
   ReleasedCallback released_callback_;
   int active_refs_;
   PropertyChangedHandler property_changed_handler_;
-  ObserverList<ShillPropertyChangedObserver, true /* check_empty */>
+  base::ObserverList<ShillPropertyChangedObserver, true /* check_empty */>
       observer_list_;
   std::vector<std::string> interfaces_to_be_monitored_;
 
diff --git a/chromeos/dbus/system_clock_client.cc b/chromeos/dbus/system_clock_client.cc
index ac0bff3..160c9c1 100644
--- a/chromeos/dbus/system_clock_client.cc
+++ b/chromeos/dbus/system_clock_client.cc
@@ -130,7 +130,7 @@ class SystemClockClientImpl : public SystemClockClient {
   bool can_set_time_;
   bool can_set_time_initialized_;
   dbus::ObjectProxy* system_clock_proxy_;
-  ObserverList<Observer> observers_;
+  base::ObserverList<Observer> observers_;
 
   base::WeakPtrFactory<SystemClockClientImpl> weak_ptr_factory_;
 
diff --git a/chromeos/dbus/update_engine_client.cc b/chromeos/dbus/update_engine_client.cc
index 31b9366c..7a0bb4c 100644
--- a/chromeos/dbus/update_engine_client.cc
+++ b/chromeos/dbus/update_engine_client.cc
@@ -383,7 +383,7 @@ class UpdateEngineClientImpl : public UpdateEngineClient {
   }
 
   dbus::ObjectProxy* update_engine_proxy_;
-  ObserverList<Observer> observers_;
+  base::ObserverList<Observer> observers_;
   Status last_status_;
 
   // Note: This should remain the last member so it'll be destroyed and
@@ -525,7 +525,7 @@ class UpdateEngineClientFakeImpl : public UpdateEngineClientStubImpl {
     }
   }
 
-  ObserverList<Observer> observers_;
+  base::ObserverList<Observer> observers_;
   Status last_status_;
 
   base::WeakPtrFactory<UpdateEngineClientFakeImpl> weak_factory_;
diff --git a/chromeos/disks/disk_mount_manager.cc b/chromeos/disks/disk_mount_manager.cc
index 483e990..9264a33 100644
--- a/chromeos/disks/disk_mount_manager.cc
+++ b/chromeos/disks/disk_mount_manager.cc
@@ -610,7 +610,7 @@ class DiskMountManagerImpl : public DiskMountManager {
   }
 
   // Mount event change observers.
-  ObserverList<Observer> observers_;
+  base::ObserverList<Observer> observers_;
 
   CrosDisksClient* cros_disks_client_;
 
diff --git a/chromeos/disks/mock_disk_mount_manager.h b/chromeos/disks/mock_disk_mount_manager.h
index 8593626..5ef4bad 100644
--- a/chromeos/disks/mock_disk_mount_manager.h
+++ b/chromeos/disks/mock_disk_mount_manager.h
@@ -103,7 +103,7 @@ class MockDiskMountManager : public DiskMountManager {
                          const DiskMountManager::Disk* disk);
 
   // The list of observers.
-  ObserverList<DiskMountManager::Observer> observers_;
+  base::ObserverList<DiskMountManager::Observer> observers_;
 
   // The list of disks found.
   DiskMountManager::DiskMap disks_;
diff --git a/chromeos/login/login_state.h b/chromeos/login/login_state.h
index 19dcfff..394357e8 100644
--- a/chromeos/login/login_state.h
+++ b/chromeos/login/login_state.h
@@ -106,7 +106,7 @@ class CHROMEOS_EXPORT LoginState {
   LoggedInState logged_in_state_;
   LoggedInUserType logged_in_user_type_;
   std::string primary_user_hash_;
-  ObserverList<Observer> observer_list_;
+  base::ObserverList<Observer> observer_list_;
 
   // If true, it always thinks the current status as logged in. Set to true by
   // default running on a Linux desktop without flags and test cases. To test
diff --git a/chromeos/network/client_cert_resolver.h b/chromeos/network/client_cert_resolver.h
index f3a6c73..d94873f 100644
--- a/chromeos/network/client_cert_resolver.h
+++ b/chromeos/network/client_cert_resolver.h
@@ -110,7 +110,7 @@ class CHROMEOS_EXPORT ClientCertResolver : public NetworkStateHandlerObserver,
   // Trigger a ResolveRequestCompleted event on all observers.
   void NotifyResolveRequestCompleted();
 
-  ObserverList<Observer> observers_;
+  base::ObserverList<Observer> observers_;
 
   // The set of networks that were checked/resolved in previous passes. These
   // networks are skipped in the NetworkListChanged notification.
diff --git a/chromeos/network/managed_network_configuration_handler_impl.h b/chromeos/network/managed_network_configuration_handler_impl.h
index 81e74f1..a2812ef 100644
--- a/chromeos/network/managed_network_configuration_handler_impl.h
+++ b/chromeos/network/managed_network_configuration_handler_impl.h
@@ -211,7 +211,7 @@ class CHROMEOS_EXPORT ManagedNetworkConfigurationHandlerImpl
   // associated set of GUIDs is empty.
   UserToModifiedPoliciesMap queued_modified_policies_;
 
-  ObserverList<NetworkPolicyObserver> observers_;
+  base::ObserverList<NetworkPolicyObserver> observers_;
 
   // For Shill client callbacks
   base::WeakPtrFactory<ManagedNetworkConfigurationHandlerImpl>
diff --git a/chromeos/network/network_configuration_handler.h b/chromeos/network/network_configuration_handler.h
index 0ab68f0..1c6abae 100644
--- a/chromeos/network/network_configuration_handler.h
+++ b/chromeos/network/network_configuration_handler.h
@@ -206,7 +206,7 @@ class CHROMEOS_EXPORT NetworkConfigurationHandler
   // Map of in-progress deleter instances. Owned by this class.
   std::map<std::string, ProfileEntryDeleter*> profile_entry_deleters_;
 
-  ObserverList<NetworkConfigurationObserver> observers_;
+  base::ObserverList<NetworkConfigurationObserver> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(NetworkConfigurationHandler);
 };
diff --git a/chromeos/network/network_connection_handler.h b/chromeos/network/network_connection_handler.h
index aef25b9..ddadf7a 100644
--- a/chromeos/network/network_connection_handler.h
+++ b/chromeos/network/network_connection_handler.h
@@ -222,7 +222,7 @@ class CHROMEOS_EXPORT NetworkConnectionHandler
   void HandleShillDisconnectSuccess(const std::string& service_path,
                                     const base::Closure& success_callback);
 
-  ObserverList<NetworkConnectionObserver> observers_;
+  base::ObserverList<NetworkConnectionObserver> observers_;
 
   // Local references to the associated handler instances.
   CertLoader* cert_loader_;
diff --git a/chromeos/network/network_profile_handler.h b/chromeos/network/network_profile_handler.h
index 1de54f2..5b55ba6 100644
--- a/chromeos/network/network_profile_handler.h
+++ b/chromeos/network/network_profile_handler.h
@@ -80,7 +80,7 @@ class CHROMEOS_EXPORT NetworkProfileHandler
   // properties are retrieved and the path is still in this set, a new profile
   // object is created.
   std::set<std::string> pending_profile_creations_;
-  ObserverList<NetworkProfileObserver> observers_;
+  base::ObserverList<NetworkProfileObserver> observers_;
 
   // For Shill client callbacks
   base::WeakPtrFactory<NetworkProfileHandler> weak_ptr_factory_;
diff --git a/chromeos/network/network_sms_handler.h b/chromeos/network/network_sms_handler.h
index 7cf4bff..bb7fcb2 100644
--- a/chromeos/network/network_sms_handler.h
+++ b/chromeos/network/network_sms_handler.h
@@ -89,7 +89,7 @@ class CHROMEOS_EXPORT NetworkSmsHandler : public ShillPropertyChangedObserver {
                                 DBusMethodCallStatus call_status,
                                 const base::DictionaryValue& properties);
 
-  ObserverList<Observer> observers_;
+  base::ObserverList<Observer> observers_;
   ScopedVector<NetworkSmsDeviceHandler> device_handlers_;
   ScopedVector<base::DictionaryValue> received_messages_;
   base::WeakPtrFactory<NetworkSmsHandler> weak_ptr_factory_;
diff --git a/chromeos/network/network_state_handler.h b/chromeos/network/network_state_handler.h
index f032f77..d7d1acd 100644
--- a/chromeos/network/network_state_handler.h
+++ b/chromeos/network/network_state_handler.h
@@ -362,7 +362,7 @@ class CHROMEOS_EXPORT NetworkStateHandler
   scoped_ptr<internal::ShillPropertyHandler> shill_property_handler_;
 
   // Observer list
-  ObserverList<NetworkStateHandlerObserver> observers_;
+  base::ObserverList<NetworkStateHandlerObserver> observers_;
 
   // List of managed network states
   ManagedStateList network_list_;
diff --git a/chromeos/settings/timezone_settings.cc b/chromeos/settings/timezone_settings.cc
index 4d0b0b4..a6833cd 100644
--- a/chromeos/settings/timezone_settings.cc
+++ b/chromeos/settings/timezone_settings.cc
@@ -283,7 +283,7 @@ class TimezoneSettingsBaseImpl : public chromeos::system::TimezoneSettings {
   const icu::TimeZone* GetKnownTimezoneOrNull(
       const icu::TimeZone& timezone) const;
 
-  ObserverList<Observer> observers_;
+  base::ObserverList<Observer> observers_;
   std::vector<icu::TimeZone*> timezones_;
   scoped_ptr<icu::TimeZone> timezone_;
 
diff --git a/components/autofill/core/browser/personal_data_manager.h b/components/autofill/core/browser/personal_data_manager.h
index 91f9276..7d2be69 100644
--- a/components/autofill/core/browser/personal_data_manager.h
+++ b/components/autofill/core/browser/personal_data_manager.h
@@ -354,7 +354,7 @@ class PersonalDataManager : public KeyedService,
   WebDataServiceBase::Handle pending_server_creditcards_query_;
 
   // The observers.
-  ObserverList<PersonalDataManagerObserver> observers_;
+  base::ObserverList<PersonalDataManagerObserver> observers_;
 
  private:
   // Finds the country code that occurs most frequently among all profiles.
diff --git a/components/autofill/core/browser/webdata/autofill_webdata_backend_impl.h b/components/autofill/core/browser/webdata/autofill_webdata_backend_impl.h
index 77d9101..bfde866 100644
--- a/components/autofill/core/browser/webdata/autofill_webdata_backend_impl.h
+++ b/components/autofill/core/browser/webdata/autofill_webdata_backend_impl.h
@@ -205,7 +205,8 @@ class AutofillWebDataBackendImpl
   void DestroyAutofillProfileResult(const WDTypedResult* result);
   void DestroyAutofillCreditCardResult(const WDTypedResult* result);
 
-  ObserverList<AutofillWebDataServiceObserverOnDBThread> db_observer_list_;
+  base::ObserverList<AutofillWebDataServiceObserverOnDBThread>
+      db_observer_list_;
 
   // WebDatabaseBackend allows direct access to DB.
   // TODO(caitkp): Make it so nobody but us needs direct DB access anymore.
diff --git a/components/autofill/core/browser/webdata/autofill_webdata_service.h b/components/autofill/core/browser/webdata/autofill_webdata_service.h
index 1c57e8e..8b42264 100644
--- a/components/autofill/core/browser/webdata/autofill_webdata_service.h
+++ b/components/autofill/core/browser/webdata/autofill_webdata_service.h
@@ -130,7 +130,8 @@ class AutofillWebDataService : public AutofillWebData,
   }
 
  private:
-  ObserverList<AutofillWebDataServiceObserverOnUIThread> ui_observer_list_;
+  base::ObserverList<AutofillWebDataServiceObserverOnUIThread>
+      ui_observer_list_;
 
   // The task runner that this class uses as its UI thread.
   scoped_refptr<base::SingleThreadTaskRunner> ui_thread_;
diff --git a/components/bookmarks/browser/bookmark_model.cc b/components/bookmarks/browser/bookmark_model.cc
index d781fdb..ca53306 100644
--- a/components/bookmarks/browser/bookmark_model.cc
+++ b/components/bookmarks/browser/bookmark_model.cc
@@ -100,7 +100,8 @@ BookmarkModel::BookmarkModel(BookmarkClient* client)
       other_node_(NULL),
       mobile_node_(NULL),
       next_node_id_(1),
-      observers_(ObserverList<BookmarkModelObserver>::NOTIFY_EXISTING_ONLY),
+      observers_(
+          base::ObserverList<BookmarkModelObserver>::NOTIFY_EXISTING_ONLY),
       loaded_signal_(true, false),
       extensive_changes_(0) {
   DCHECK(client_);
diff --git a/components/bookmarks/browser/bookmark_model.h b/components/bookmarks/browser/bookmark_model.h
index e222790..50760c8 100644
--- a/components/bookmarks/browser/bookmark_model.h
+++ b/components/bookmarks/browser/bookmark_model.h
@@ -416,7 +416,7 @@ class BookmarkModel : public KeyedService {
   int64 next_node_id_;
 
   // The observers.
-  ObserverList<BookmarkModelObserver> observers_;
+  base::ObserverList<BookmarkModelObserver> observers_;
 
   // Set of nodes ordered by URL. This is not a map to avoid copying the
   // urls.
diff --git a/components/content_settings/core/browser/content_settings_observable_provider.h b/components/content_settings/core/browser/content_settings_observable_provider.h
index cb6a01dd..84f01f2 100644
--- a/components/content_settings/core/browser/content_settings_observable_provider.h
+++ b/components/content_settings/core/browser/content_settings_observable_provider.h
@@ -33,7 +33,7 @@ class ObservableProvider : public ProviderInterface {
 
  private:
   base::ThreadChecker thread_checker_;
-  ObserverList<Observer, true> observer_list_;
+  base::ObserverList<Observer, true> observer_list_;
 };
 
 }  // namespace content_settings
diff --git a/components/content_settings/core/browser/host_content_settings_map.h b/components/content_settings/core/browser/host_content_settings_map.h
index 9566883..c77192c 100644
--- a/components/content_settings/core/browser/host_content_settings_map.h
+++ b/components/content_settings/core/browser/host_content_settings_map.h
@@ -361,7 +361,7 @@ class HostContentSettingsMap
 
   base::ThreadChecker thread_checker_;
 
-  ObserverList<content_settings::Observer> observers_;
+  base::ObserverList<content_settings::Observer> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(HostContentSettingsMap);
 };
diff --git a/components/copresence/copresence_state_impl.h b/components/copresence/copresence_state_impl.h
index 8c3e377..4b9bf76 100644
--- a/components/copresence/copresence_state_impl.h
+++ b/components/copresence/copresence_state_impl.h
@@ -61,7 +61,7 @@ class CopresenceStateImpl final : public CopresenceState {
   std::map<std::string, TransmittedToken> transmitted_tokens_;
   std::map<std::string, ReceivedToken> received_tokens_;
 
-  ObserverList<CopresenceObserver> observers_;
+  base::ObserverList<CopresenceObserver> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(CopresenceStateImpl);
 };
diff --git a/components/cronet/android/cronet_in_memory_pref_store.h b/components/cronet/android/cronet_in_memory_pref_store.h
index c276ff8..daebace 100644
--- a/components/cronet/android/cronet_in_memory_pref_store.h
+++ b/components/cronet/android/cronet_in_memory_pref_store.h
@@ -54,7 +54,7 @@ class CronetInMemoryPrefStore : public PersistentPrefStore {
   // Stores the preference values.
   PrefValueMap prefs_;
 
-  ObserverList<PrefStore::Observer, true> observers_;
+  base::ObserverList<PrefStore::Observer, true> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(CronetInMemoryPrefStore);
 };
diff --git a/components/data_reduction_proxy/core/browser/data_reduction_proxy_service.h b/components/data_reduction_proxy/core/browser/data_reduction_proxy_service.h
index 0f8616d..46dce7c 100644
--- a/components/data_reduction_proxy/core/browser/data_reduction_proxy_service.h
+++ b/components/data_reduction_proxy/core/browser/data_reduction_proxy_service.h
@@ -143,7 +143,7 @@ class DataReductionProxyService
   // make calls to IO based objects.
   base::WeakPtr<DataReductionProxyIOData> io_data_;
 
-  ObserverList<DataReductionProxyServiceObserver> observer_list_;
+  base::ObserverList<DataReductionProxyServiceObserver> observer_list_;
 
   bool initialized_;
 
diff --git a/components/dom_distiller/core/distilled_page_prefs.h b/components/dom_distiller/core/distilled_page_prefs.h
index eeec8a9..22b1327 100644
--- a/components/dom_distiller/core/distilled_page_prefs.h
+++ b/components/dom_distiller/core/distilled_page_prefs.h
@@ -65,7 +65,7 @@ class DistilledPagePrefs {
   void NotifyOnChangeTheme(Theme theme);
 
   PrefService* pref_service_;
-  ObserverList<Observer> observers_;
+  base::ObserverList<Observer> observers_;
 
   base::WeakPtrFactory<DistilledPagePrefs> weak_ptr_factory_;
 
diff --git a/components/dom_distiller/core/dom_distiller_store.h b/components/dom_distiller/core/dom_distiller_store.h
index 2440ce5..8f9c637 100644
--- a/components/dom_distiller/core/dom_distiller_store.h
+++ b/components/dom_distiller/core/dom_distiller_store.h
@@ -200,7 +200,7 @@ class DomDistillerStore : public syncer::SyncableService,
   scoped_ptr<leveldb_proto::ProtoDatabase<ArticleEntry> > database_;
   bool database_loaded_;
   scoped_ptr<syncer::AttachmentStore> attachment_store_;
-  ObserverList<DomDistillerObserver> observers_;
+  base::ObserverList<DomDistillerObserver> observers_;
 
   DomDistillerModel model_;
 
diff --git a/components/enhanced_bookmarks/bookmark_server_service.h b/components/enhanced_bookmarks/bookmark_server_service.h
index 4519033..9428f85 100644
--- a/components/enhanced_bookmarks/bookmark_server_service.h
+++ b/components/enhanced_bookmarks/bookmark_server_service.h
@@ -93,7 +93,7 @@ class BookmarkServerService : protected net::URLFetcherDelegate,
 
  protected:
   // The observers.
-  ObserverList<BookmarkServerServiceObserver> observers_;
+  base::ObserverList<BookmarkServerServiceObserver> observers_;
 
  private:
   FRIEND_TEST_ALL_PREFIXES(BookmarkServerServiceTest, Cluster);
diff --git a/components/enhanced_bookmarks/enhanced_bookmark_model.h b/components/enhanced_bookmarks/enhanced_bookmark_model.h
index 9bc5e89..0d9e2a7 100644
--- a/components/enhanced_bookmarks/enhanced_bookmark_model.h
+++ b/components/enhanced_bookmarks/enhanced_bookmark_model.h
@@ -202,7 +202,7 @@ class EnhancedBookmarkModel : public KeyedService,
   bookmarks::BookmarkModel* bookmark_model_;
   bool loaded_;
 
-  ObserverList<EnhancedBookmarkModelObserver> observers_;
+  base::ObserverList<EnhancedBookmarkModelObserver> observers_;
 
   IdToNodeMap id_map_;
   NodeToIdMap nodes_to_reset_;
diff --git a/components/favicon/core/favicon_driver.h b/components/favicon/core/favicon_driver.h
index a030845a..fbd4c6e 100644
--- a/components/favicon/core/favicon_driver.h
+++ b/components/favicon/core/favicon_driver.h
@@ -115,7 +115,7 @@ class FaviconDriver {
   virtual void NotifyFaviconUpdated(bool icon_url_changed);
 
  private:
-  ObserverList<FaviconDriverObserver> observer_list_;
+  base::ObserverList<FaviconDriverObserver> observer_list_;
 
   DISALLOW_COPY_AND_ASSIGN(FaviconDriver);
 };
diff --git a/components/gcm_driver/gcm_driver_desktop.h b/components/gcm_driver/gcm_driver_desktop.h
index 6012a90..aa0182e 100644
--- a/components/gcm_driver/gcm_driver_desktop.h
+++ b/components/gcm_driver/gcm_driver_desktop.h
@@ -194,7 +194,7 @@ class GCMDriverDesktop : public GCMDriver,
   bool connected_;
 
   // List of observers to notify when connection state changes.
-  ObserverList<GCMConnectionObserver, false> connection_observer_list_;
+  base::ObserverList<GCMConnectionObserver, false> connection_observer_list_;
 
   // Account mapper. Only works when user is signed in.
   scoped_ptr<GCMAccountMapper> account_mapper_;
diff --git a/components/history/core/browser/history_backend.h b/components/history/core/browser/history_backend.h
index c1148cf..0903cbbd 100644
--- a/components/history/core/browser/history_backend.h
+++ b/components/history/core/browser/history_backend.h
@@ -822,7 +822,7 @@ class HistoryBackend : public base::RefCountedThreadSafe<HistoryBackend>,
   scoped_ptr<base::MemoryPressureListener> memory_pressure_listener_;
 
   // List of observers
-  ObserverList<HistoryBackendObserver> observers_;
+  base::ObserverList<HistoryBackendObserver> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(HistoryBackend);
 };
diff --git a/components/history/core/browser/history_service.h b/components/history/core/browser/history_service.h
index 148e2a1..f45d926 100644
--- a/components/history/core/browser/history_service.h
+++ b/components/history/core/browser/history_service.h
@@ -797,7 +797,7 @@ class HistoryService : public syncer::SyncableService, public KeyedService {
   // completed.
   bool backend_loaded_;
 
-  ObserverList<HistoryServiceObserver> observers_;
+  base::ObserverList<HistoryServiceObserver> observers_;
   base::CallbackList<void(const std::set<GURL>&)>
       favicon_changed_callback_list_;
 
diff --git a/components/history/core/browser/top_sites.h b/components/history/core/browser/top_sites.h
index 03626f4..f7a6aac 100644
--- a/components/history/core/browser/top_sites.h
+++ b/components/history/core/browser/top_sites.h
@@ -184,7 +184,7 @@ class TopSites : public RefcountedKeyedService {
  private:
   friend class base::RefCountedThreadSafe<TopSites>;
 
-  ObserverList<TopSitesObserver, true> observer_list_;
+  base::ObserverList<TopSitesObserver, true> observer_list_;
 
   DISALLOW_COPY_AND_ASSIGN(TopSites);
 };
diff --git a/components/infobars/core/infobar_manager.h b/components/infobars/core/infobar_manager.h
index 5685a03..d984f5b 100644
--- a/components/infobars/core/infobar_manager.h
+++ b/components/infobars/core/infobar_manager.h
@@ -120,7 +120,7 @@ class InfoBarManager {
   InfoBars infobars_;
   bool infobars_enabled_;
 
-  ObserverList<Observer, true> observer_list_;
+  base::ObserverList<Observer, true> observer_list_;
 
   DISALLOW_COPY_AND_ASSIGN(InfoBarManager);
 };
diff --git a/components/invalidation/invalidation_logger.h b/components/invalidation/invalidation_logger.h
index e19ff07..fe44508 100644
--- a/components/invalidation/invalidation_logger.h
+++ b/components/invalidation/invalidation_logger.h
@@ -76,7 +76,7 @@ class InvalidationLogger {
   void EmitRegisteredHandlers();
 
   // The list of every observer currently listening for notifications.
-  ObserverList<InvalidationLoggerObserver> observer_list_;
+  base::ObserverList<InvalidationLoggerObserver> observer_list_;
 
   // The last InvalidatorState updated by the InvalidatorService.
   syncer::InvalidatorState last_invalidator_state_;
diff --git a/components/invalidation/invalidator_registrar.h b/components/invalidation/invalidator_registrar.h
index d0ab22d..9acf26c 100644
--- a/components/invalidation/invalidator_registrar.h
+++ b/components/invalidation/invalidator_registrar.h
@@ -85,7 +85,7 @@ class INVALIDATION_EXPORT InvalidatorRegistrar {
   typedef std::map<InvalidationHandler*, ObjectIdSet> HandlerIdsMap;
 
   base::ThreadChecker thread_checker_;
-  ObserverList<InvalidationHandler, true> handlers_;
+  base::ObserverList<InvalidationHandler, true> handlers_;
   HandlerIdsMap handler_to_ids_map_;
   InvalidatorState state_;
 
diff --git a/components/invalidation/sync_system_resources.h b/components/invalidation/sync_system_resources.h
index 6aaac89..7e707e7 100644
--- a/components/invalidation/sync_system_resources.h
+++ b/components/invalidation/sync_system_resources.h
@@ -171,7 +171,7 @@ class INVALIDATION_EXPORT_PRIVATE SyncNetworkChannel
 
   int received_messages_count_;
 
-  ObserverList<Observer> observers_;
+  base::ObserverList<Observer> observers_;
 };
 
 class SyncStorage : public invalidation::Storage {
diff --git a/components/invalidation/ticl_settings_provider.h b/components/invalidation/ticl_settings_provider.h
index c62a4d0..72f495c 100644
--- a/components/invalidation/ticl_settings_provider.h
+++ b/components/invalidation/ticl_settings_provider.h
@@ -34,7 +34,7 @@ class TiclSettingsProvider {
   void FireOnUseGCMChannelChanged();
 
  private:
-  ObserverList<Observer, true> observers_;
+  base::ObserverList<Observer, true> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(TiclSettingsProvider);
 };
diff --git a/components/metrics/metrics_service.h b/components/metrics/metrics_service.h
index af1324c..5499326 100644
--- a/components/metrics/metrics_service.h
+++ b/components/metrics/metrics_service.h
@@ -474,7 +474,7 @@ class MetricsService : public base::HistogramFlattener {
   SyntheticTrialGroups synthetic_trial_groups_;
 
   // List of observers of |synthetic_trial_groups_| changes.
-  ObserverList<SyntheticTrialObserver> synthetic_trial_observer_list_;
+  base::ObserverList<SyntheticTrialObserver> synthetic_trial_observer_list_;
 
   // Execution phase the browser is in.
   static ExecutionPhase execution_phase_;
diff --git a/components/ownership/owner_settings_service.h b/components/ownership/owner_settings_service.h
index d0438b6..3c406d9 100644
--- a/components/ownership/owner_settings_service.h
+++ b/components/ownership/owner_settings_service.h
@@ -135,7 +135,7 @@ class OWNERSHIP_EXPORT OwnerSettingsService : public KeyedService {
 
   std::vector<IsOwnerCallback> pending_is_owner_callbacks_;
 
-  ObserverList<Observer> observers_;
+  base::ObserverList<Observer> observers_;
 
   base::ThreadChecker thread_checker_;
 
diff --git a/components/pairing/bluetooth_controller_pairing_controller.h b/components/pairing/bluetooth_controller_pairing_controller.h
index ab67aed..ecd8656 100644
--- a/components/pairing/bluetooth_controller_pairing_controller.h
+++ b/components/pairing/bluetooth_controller_pairing_controller.h
@@ -113,7 +113,7 @@ class BluetoothControllerPairingController
   scoped_ptr<ProtoDecoder> proto_decoder_;
 
   base::ThreadChecker thread_checker_;
-  ObserverList<ControllerPairingController::Observer> observers_;
+  base::ObserverList<ControllerPairingController::Observer> observers_;
   base::WeakPtrFactory<BluetoothControllerPairingController> ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(BluetoothControllerPairingController);
diff --git a/components/pairing/bluetooth_host_pairing_controller.h b/components/pairing/bluetooth_host_pairing_controller.h
index 1873935..1724cd0 100644
--- a/components/pairing/bluetooth_host_pairing_controller.h
+++ b/components/pairing/bluetooth_host_pairing_controller.h
@@ -111,7 +111,7 @@ class BluetoothHostPairingController
   scoped_ptr<ProtoDecoder> proto_decoder_;
 
   base::ThreadChecker thread_checker_;
-  ObserverList<Observer> observers_;
+  base::ObserverList<Observer> observers_;
   base::WeakPtrFactory<BluetoothHostPairingController> ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(BluetoothHostPairingController);
diff --git a/components/pairing/fake_controller_pairing_controller.h b/components/pairing/fake_controller_pairing_controller.h
index c1801e2..a342539 100644
--- a/components/pairing/fake_controller_pairing_controller.h
+++ b/components/pairing/fake_controller_pairing_controller.h
@@ -93,7 +93,7 @@ class FakeControllerPairingController
   void PairingStageChanged(Stage new_stage) override;
   void DiscoveredDevicesListChanged() override;
 
-  ObserverList<ControllerPairingController::Observer> observers_;
+  base::ObserverList<ControllerPairingController::Observer> observers_;
   Stage current_stage_;
   std::string confirmation_code_;
   std::string preset_confirmation_code_;
diff --git a/components/pairing/fake_host_pairing_controller.h b/components/pairing/fake_host_pairing_controller.h
index fcca881..862e3d5 100644
--- a/components/pairing/fake_host_pairing_controller.h
+++ b/components/pairing/fake_host_pairing_controller.h
@@ -52,7 +52,7 @@ class FakeHostPairingController
   // HostPairingController::Observer:
   void PairingStageChanged(Stage new_stage) override;
 
-  ObserverList<Observer> observers_;
+  base::ObserverList<Observer> observers_;
   Stage current_stage_;
   std::string device_name_;
   std::string confirmation_code_;
diff --git a/components/password_manager/core/browser/affiliation_fetch_throttler_unittest.cc b/components/password_manager/core/browser/affiliation_fetch_throttler_unittest.cc
index e081e84..5175745 100644
--- a/components/password_manager/core/browser/affiliation_fetch_throttler_unittest.cc
+++ b/components/password_manager/core/browser/affiliation_fetch_throttler_unittest.cc
@@ -120,7 +120,8 @@ class AffiliationFetchThrottlerTest : public testing::Test {
   }
 
  private:
-  // Needed because NetworkChangeNotifier uses ObserverList, which notifies
+  // Needed because NetworkChangeNotifier uses base::ObserverList, which
+  // notifies
   // observers on the MessageLoop that belongs to the thread from which they
   // have registered.
   base::MessageLoop message_loop_;
diff --git a/components/password_manager/core/browser/log_router.h b/components/password_manager/core/browser/log_router.h
index 06ca4e6..f959dba 100644
--- a/components/password_manager/core/browser/log_router.h
+++ b/components/password_manager/core/browser/log_router.h
@@ -51,8 +51,8 @@ class LogRouter {
   // Observer lists for clients and receivers. The |true| in the template
   // specialisation means that they will check that all observers were removed
   // on destruction.
-  ObserverList<PasswordManagerClient, true> clients_;
-  ObserverList<LogReceiver, true> receivers_;
+  base::ObserverList<PasswordManagerClient, true> clients_;
+  base::ObserverList<LogReceiver, true> receivers_;
 
   // Logs accumulated since the first receiver was registered.
   std::string accumulated_logs_;
diff --git a/components/password_manager/core/browser/password_manager.h b/components/password_manager/core/browser/password_manager.h
index 6f0172d..09d2851 100644
--- a/components/password_manager/core/browser/password_manager.h
+++ b/components/password_manager/core/browser/password_manager.h
@@ -193,7 +193,7 @@ class PasswordManager : public LoginModel {
 
   // Observers to be notified of LoginModel events.  This is mutable to allow
   // notification in const member functions.
-  mutable ObserverList<LoginModelObserver> observers_;
+  mutable base::ObserverList<LoginModelObserver> observers_;
 
   // Callbacks to be notified when a password form has been submitted.
   std::vector<PasswordSubmittedCallback> submission_callbacks_;
diff --git a/components/password_manager/core/browser/password_store.cc b/components/password_manager/core/browser/password_store.cc
index d987ec6..ce3279f 100644
--- a/components/password_manager/core/browser/password_store.cc
+++ b/components/password_manager/core/browser/password_store.cc
@@ -71,7 +71,7 @@ PasswordStore::PasswordStore(
     scoped_refptr<base::SingleThreadTaskRunner> db_thread_runner)
     : main_thread_runner_(main_thread_runner),
       db_thread_runner_(db_thread_runner),
-      observers_(new ObserverListThreadSafe<Observer>()),
+      observers_(new base::ObserverListThreadSafe<Observer>()),
       is_propagating_password_changes_to_web_credentials_enabled_(false),
       shutdown_called_(false) {
 }
diff --git a/components/password_manager/core/browser/password_store.h b/components/password_manager/core/browser/password_store.h
index eda5ee3..91ec3b5 100644
--- a/components/password_manager/core/browser/password_store.h
+++ b/components/password_manager/core/browser/password_store.h
@@ -376,7 +376,7 @@ class PasswordStore : protected PasswordStoreSync,
   void DestroySyncableService();
 
   // The observers.
-  scoped_refptr<ObserverListThreadSafe<Observer>> observers_;
+  scoped_refptr<base::ObserverListThreadSafe<Observer>> observers_;
 
   scoped_ptr<PasswordSyncableService> syncable_service_;
   scoped_ptr<AffiliatedMatchHelper> affiliated_match_helper_;
diff --git a/components/policy/core/browser/configuration_policy_pref_store.h b/components/policy/core/browser/configuration_policy_pref_store.h
index 6722bba..64e393a 100644
--- a/components/policy/core/browser/configuration_policy_pref_store.h
+++ b/components/policy/core/browser/configuration_policy_pref_store.h
@@ -75,7 +75,7 @@ class POLICY_EXPORT ConfigurationPolicyPrefStore
   // Current policy preferences.
   scoped_ptr<PrefValueMap> prefs_;
 
-  ObserverList<PrefStore::Observer, true> observers_;
+  base::ObserverList<PrefStore::Observer, true> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(ConfigurationPolicyPrefStore);
 };
diff --git a/components/policy/core/common/cloud/cloud_policy_client.h b/components/policy/core/common/cloud/cloud_policy_client.h
index 2f98613..2015b93 100644
--- a/components/policy/core/common/cloud/cloud_policy_client.h
+++ b/components/policy/core/common/cloud/cloud_policy_client.h
@@ -374,7 +374,7 @@ class POLICY_EXPORT CloudPolicyClient {
   ResponseMap responses_;
   DeviceManagementStatus status_;
 
-  ObserverList<Observer, true> observers_;
+  base::ObserverList<Observer, true> observers_;
   scoped_refptr<net::URLRequestContextGetter> request_context_;
 
  private:
diff --git a/components/policy/core/common/cloud/cloud_policy_core.h b/components/policy/core/common/cloud/cloud_policy_core.h
index 7a9bf59..b5813a0 100644
--- a/components/policy/core/common/cloud/cloud_policy_core.h
+++ b/components/policy/core/common/cloud/cloud_policy_core.h
@@ -128,7 +128,7 @@ class POLICY_EXPORT CloudPolicyCore {
   scoped_ptr<CloudPolicyRefreshScheduler> refresh_scheduler_;
   scoped_ptr<RemoteCommandsService> remote_commands_service_;
   scoped_ptr<IntegerPrefMember> refresh_delay_;
-  ObserverList<Observer, true> observers_;
+  base::ObserverList<Observer, true> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(CloudPolicyCore);
 };
diff --git a/components/policy/core/common/cloud/cloud_policy_service.h b/components/policy/core/common/cloud/cloud_policy_service.h
index 9dc00b4..465db98 100644
--- a/components/policy/core/common/cloud/cloud_policy_service.h
+++ b/components/policy/core/common/cloud/cloud_policy_service.h
@@ -127,7 +127,7 @@ class POLICY_EXPORT CloudPolicyService : public CloudPolicyClient::Observer,
 
   // Observers who will receive notifications when the service has finished
   // initializing.
-  ObserverList<Observer, true> observers_;
+  base::ObserverList<Observer, true> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(CloudPolicyService);
 };
diff --git a/components/policy/core/common/cloud/cloud_policy_store.h b/components/policy/core/common/cloud/cloud_policy_store.h
index 6edadaf..9a86f91 100644
--- a/components/policy/core/common/cloud/cloud_policy_store.h
+++ b/components/policy/core/common/cloud/cloud_policy_store.h
@@ -155,7 +155,7 @@ class POLICY_EXPORT CloudPolicyStore {
   // triggered by calling Load().
   bool is_initialized_;
 
-  ObserverList<Observer, true> observers_;
+  base::ObserverList<Observer, true> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(CloudPolicyStore);
 };
diff --git a/components/policy/core/common/configuration_policy_provider.h b/components/policy/core/common/configuration_policy_provider.h
index 0bfa344a..e91ac21 100644
--- a/components/policy/core/common/configuration_policy_provider.h
+++ b/components/policy/core/common/configuration_policy_provider.h
@@ -94,7 +94,7 @@ class POLICY_EXPORT ConfigurationPolicyProvider
 
   SchemaRegistry* schema_registry_;
 
-  ObserverList<Observer, true> observer_list_;
+  base::ObserverList<Observer, true> observer_list_;
 
   DISALLOW_COPY_AND_ASSIGN(ConfigurationPolicyProvider);
 };
diff --git a/components/policy/core/common/policy_service_impl.h b/components/policy/core/common/policy_service_impl.h
index 56f5675..3551289 100644
--- a/components/policy/core/common/policy_service_impl.h
+++ b/components/policy/core/common/policy_service_impl.h
@@ -48,7 +48,7 @@ class POLICY_EXPORT PolicyServiceImpl
   void RefreshPolicies(const base::Closure& callback) override;
 
  private:
-  typedef ObserverList<PolicyService::Observer, true> Observers;
+  typedef base::ObserverList<PolicyService::Observer, true> Observers;
   typedef std::map<PolicyDomain, Observers*> ObserverMap;
 
   // ConfigurationPolicyProvider::Observer overrides:
diff --git a/components/policy/core/common/remote_commands/remote_commands_queue.h b/components/policy/core/common/remote_commands/remote_commands_queue.h
index 682a549..fb03e18 100644
--- a/components/policy/core/common/remote_commands/remote_commands_queue.h
+++ b/components/policy/core/common/remote_commands/remote_commands_queue.h
@@ -79,7 +79,7 @@ class POLICY_EXPORT RemoteCommandsQueue {
   scoped_ptr<base::TickClock> clock_;
   base::OneShotTimer<RemoteCommandsQueue> execution_timeout_timer_;
 
-  ObserverList<Observer, true> observer_list_;
+  base::ObserverList<Observer, true> observer_list_;
 
   DISALLOW_COPY_AND_ASSIGN(RemoteCommandsQueue);
 };
diff --git a/components/policy/core/common/schema_registry.h b/components/policy/core/common/schema_registry.h
index 97cc4b9..4031f75 100644
--- a/components/policy/core/common/schema_registry.h
+++ b/components/policy/core/common/schema_registry.h
@@ -88,8 +88,8 @@ class POLICY_EXPORT SchemaRegistry : public base::NonThreadSafe {
   scoped_refptr<SchemaMap> schema_map_;
 
  private:
-  ObserverList<Observer, true> observers_;
-  ObserverList<InternalObserver, true> internal_observers_;
+  base::ObserverList<Observer, true> observers_;
+  base::ObserverList<InternalObserver, true> internal_observers_;
   bool domains_ready_[POLICY_DOMAIN_SIZE];
 
   DISALLOW_COPY_AND_ASSIGN(SchemaRegistry);
diff --git a/components/proximity_auth/client.h b/components/proximity_auth/client.h
index 3b66e8e..269c672 100644
--- a/components/proximity_auth/client.h
+++ b/components/proximity_auth/client.h
@@ -108,7 +108,7 @@ class Client : public ConnectionObserver {
   scoped_ptr<SecureContext> secure_context_;
 
   // The registered observers of |this_| client.
-  ObserverList<ClientObserver> observers_;
+  base::ObserverList<ClientObserver> observers_;
 
   // Queue of messages to send to the remote device.
   std::deque<PendingMessage> queued_messages_;
diff --git a/components/proximity_auth/connection.h b/components/proximity_auth/connection.h
index 8b2e7fc..41414f6 100644
--- a/components/proximity_auth/connection.h
+++ b/components/proximity_auth/connection.h
@@ -99,7 +99,7 @@ class Connection {
   Status status_;
 
   // The registered observers of the connection.
-  ObserverList<ConnectionObserver> observers_;
+  base::ObserverList<ConnectionObserver> observers_;
 
   // A temporary buffer storing bytes received before a received message can be
   // fully constructed.
diff --git a/components/proximity_auth/cryptauth/mock_cryptauth_client.h b/components/proximity_auth/cryptauth/mock_cryptauth_client.h
index de818ec..f137c00 100644
--- a/components/proximity_auth/cryptauth/mock_cryptauth_client.h
+++ b/components/proximity_auth/cryptauth/mock_cryptauth_client.h
@@ -73,7 +73,7 @@ class MockCryptAuthClientFactory : public CryptAuthClientFactory {
   bool is_strict_;
 
   // Observers of the factory.
-  ObserverList<Observer> observer_list_;
+  base::ObserverList<Observer> observer_list_;
 
   DISALLOW_COPY_AND_ASSIGN(MockCryptAuthClientFactory);
 };
diff --git a/components/proximity_auth/logging/log_buffer.h b/components/proximity_auth/logging/log_buffer.h
index dd554bc..46b335a 100644
--- a/components/proximity_auth/logging/log_buffer.h
+++ b/components/proximity_auth/logging/log_buffer.h
@@ -71,7 +71,7 @@ class LogBuffer {
   std::list<LogMessage> log_messages_;
 
   // List of observers.
-  ObserverList<Observer> observers_;
+  base::ObserverList<Observer> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(LogBuffer);
 };
diff --git a/components/proximity_auth/screenlock_bridge.h b/components/proximity_auth/screenlock_bridge.h
index 8386370..f9a47a4 100644
--- a/components/proximity_auth/screenlock_bridge.h
+++ b/components/proximity_auth/screenlock_bridge.h
@@ -180,7 +180,7 @@ class ScreenlockBridge {
   LockHandler* lock_handler_;    // Not owned
   // The last focused user's id.
   std::string focused_user_id_;
-  ObserverList<Observer, true> observers_;
+  base::ObserverList<Observer, true> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(ScreenlockBridge);
 };
diff --git a/components/renderer_context_menu/render_view_context_menu_base.h b/components/renderer_context_menu/render_view_context_menu_base.h
index 0e02838..e11628f 100644
--- a/components/renderer_context_menu/render_view_context_menu_base.h
+++ b/components/renderer_context_menu/render_view_context_menu_base.h
@@ -178,7 +178,7 @@ class RenderViewContextMenuBase : public ui::SimpleMenuModel::Delegate,
   const int render_frame_id_;
 
   // Our observers.
-  mutable ObserverList<RenderViewContextMenuObserver> observers_;
+  mutable base::ObserverList<RenderViewContextMenuObserver> observers_;
 
   // Whether a command has been executed. Used to track whether menu observers
   // should be notified of menu closing without execution.
diff --git a/components/search_engines/template_url_service.h b/components/search_engines/template_url_service.h
index 299ec0b..bd17246 100644
--- a/components/search_engines/template_url_service.h
+++ b/components/search_engines/template_url_service.h
@@ -646,7 +646,7 @@ class TemplateURLService : public WebDataServiceConsumer,
 
   TemplateURLVector template_urls_;
 
-  ObserverList<TemplateURLServiceObserver> model_observers_;
+  base::ObserverList<TemplateURLServiceObserver> model_observers_;
 
   // Maps from host to set of TemplateURLs whose search url host is host.
   // NOTE: This is always non-NULL; we use a scoped_ptr<> to avoid circular
diff --git a/components/search_provider_logos/logo_tracker.h b/components/search_provider_logos/logo_tracker.h
index 182eed7..29933eb 100644
--- a/components/search_provider_logos/logo_tracker.h
+++ b/components/search_provider_logos/logo_tracker.h
@@ -209,7 +209,7 @@ class LogoTracker : public net::URLFetcherDelegate {
 
   // The list of observers to be notified when the logo is available. This
   // should be empty when the state is IDLE.
-  ObserverList<LogoObserver> logo_observers_;
+  base::ObserverList<LogoObserver> logo_observers_;
 
   scoped_ptr<LogoDelegate> logo_delegate_;
 
diff --git a/components/signin/core/browser/about_signin_internals.h b/components/signin/core/browser/about_signin_internals.h
index a2c1d23..f14ed9d 100644
--- a/components/signin/core/browser/about_signin_internals.h
+++ b/components/signin/core/browser/about_signin_internals.h
@@ -210,7 +210,7 @@ class AboutSigninInternals
   // Most of the values are mirrored in the prefs for persistence.
   SigninStatus signin_status_;
 
-  ObserverList<Observer> signin_observers_;
+  base::ObserverList<Observer> signin_observers_;
 
   DISALLOW_COPY_AND_ASSIGN(AboutSigninInternals);
 };
diff --git a/components/signin/core/browser/account_tracker_service.h b/components/signin/core/browser/account_tracker_service.h
index 3df75f6..1bb2ba1 100644
--- a/components/signin/core/browser/account_tracker_service.h
+++ b/components/signin/core/browser/account_tracker_service.h
@@ -191,7 +191,7 @@ class AccountTrackerService : public KeyedService,
   SigninClient* signin_client_;  // Not owned.
   std::map<std::string, AccountInfoFetcher*> user_info_requests_;
   std::map<std::string, AccountState> accounts_;
-  ObserverList<Observer> observer_list_;
+  base::ObserverList<Observer> observer_list_;
   bool shutdown_called_;
   bool network_fetches_enabled_;
   std::list<std::string> pending_user_info_fetches_;
diff --git a/components/signin/core/browser/gaia_cookie_manager_service.h b/components/signin/core/browser/gaia_cookie_manager_service.h
index b1a7fed..b04ebda 100644
--- a/components/signin/core/browser/gaia_cookie_manager_service.h
+++ b/components/signin/core/browser/gaia_cookie_manager_service.h
@@ -267,7 +267,7 @@ class GaiaCookieManagerService : public KeyedService,
 
   // List of observers to notify when merge session completes.
   // Makes sure list is empty on destruction.
-  ObserverList<Observer, true> observer_list_;
+  base::ObserverList<Observer, true> observer_list_;
 
   // Source to use with GAIA endpoints for accounting.
   std::string source_;
diff --git a/components/signin/core/browser/signin_error_controller.h b/components/signin/core/browser/signin_error_controller.h
index 2eea9a5..d0e17c0 100644
--- a/components/signin/core/browser/signin_error_controller.h
+++ b/components/signin/core/browser/signin_error_controller.h
@@ -72,7 +72,7 @@ class SigninErrorController : public KeyedService {
   // NONE if AuthStatusChanged() has never been invoked).
   GoogleServiceAuthError auth_error_;
 
-  ObserverList<Observer, false> observer_list_;
+  base::ObserverList<Observer, false> observer_list_;
 
   DISALLOW_COPY_AND_ASSIGN(SigninErrorController);
 };
diff --git a/components/signin/core/browser/signin_manager_base.h b/components/signin/core/browser/signin_manager_base.h
index b064734..fb712ad 100644
--- a/components/signin/core/browser/signin_manager_base.h
+++ b/components/signin/core/browser/signin_manager_base.h
@@ -139,7 +139,7 @@ class SigninManagerBase : public KeyedService {
 
   // List of observers to notify on signin events.
   // Makes sure list is empty on destruction.
-  ObserverList<Observer, true> observer_list_;
+  base::ObserverList<Observer, true> observer_list_;
 
   // Helper method to notify all registered diagnostics observers with.
   void NotifyDiagnosticsObservers(
@@ -158,7 +158,7 @@ class SigninManagerBase : public KeyedService {
   std::string authenticated_account_id_;
 
   // The list of SigninDiagnosticObservers.
-  ObserverList<signin_internals_util::SigninDiagnosticsObserver, true>
+  base::ObserverList<signin_internals_util::SigninDiagnosticsObserver, true>
       signin_diagnostics_observers_;
 
   base::WeakPtrFactory<SigninManagerBase> weak_pointer_factory_;
diff --git a/components/storage_monitor/storage_monitor.cc b/components/storage_monitor/storage_monitor.cc
index 0f1f6cc..e571dd2 100644
--- a/components/storage_monitor/storage_monitor.cc
+++ b/components/storage_monitor/storage_monitor.cc
@@ -134,7 +134,8 @@ void StorageMonitor::EjectDevice(
 }
 
 StorageMonitor::StorageMonitor()
-    : observer_list_(new ObserverListThreadSafe<RemovableStorageObserver>()),
+    : observer_list_(
+          new base::ObserverListThreadSafe<RemovableStorageObserver>()),
       initializing_(false),
       initialized_(false),
       transient_device_ids_(new TransientDeviceIds) {
diff --git a/components/storage_monitor/storage_monitor.h b/components/storage_monitor/storage_monitor.h
index 14223e6..5ddfe89 100644
--- a/components/storage_monitor/storage_monitor.h
+++ b/components/storage_monitor/storage_monitor.h
@@ -170,7 +170,7 @@ class StorageMonitor {
 
   scoped_ptr<Receiver> receiver_;
 
-  scoped_refptr<ObserverListThreadSafe<RemovableStorageObserver> >
+  scoped_refptr<base::ObserverListThreadSafe<RemovableStorageObserver>>
       observer_list_;
 
   // Used to make sure we call initialize from the same thread as creation.
diff --git a/components/sync_driver/device_info_sync_service.h b/components/sync_driver/device_info_sync_service.h
index 5255155..7476dcb 100644
--- a/components/sync_driver/device_info_sync_service.h
+++ b/components/sync_driver/device_info_sync_service.h
@@ -98,7 +98,7 @@ class DeviceInfoSyncService : public syncer::SyncableService,
   SyncDataMap all_data_;
 
   // Registered observers, not owned.
-  ObserverList<Observer, true> observers_;
+  base::ObserverList<Observer, true> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(DeviceInfoSyncService);
 };
diff --git a/components/sync_driver/sync_prefs.h b/components/sync_driver/sync_prefs.h
index 10b3bcd..4521c4e 100644
--- a/components/sync_driver/sync_prefs.h
+++ b/components/sync_driver/sync_prefs.h
@@ -173,7 +173,7 @@ class SyncPrefs : NON_EXPORTED_BASE(public base::NonThreadSafe),
   // May be NULL.
   PrefService* const pref_service_;
 
-  ObserverList<SyncPrefObserver> sync_pref_observers_;
+  base::ObserverList<SyncPrefObserver> sync_pref_observers_;
 
   // The preference that controls whether sync is under control by
   // configuration management.
diff --git a/components/translate/content/browser/content_translate_driver.h b/components/translate/content/browser/content_translate_driver.h
index 4acb00d..831bcc0 100644
--- a/components/translate/content/browser/content_translate_driver.h
+++ b/components/translate/content/browser/content_translate_driver.h
@@ -109,7 +109,7 @@ class ContentTranslateDriver : public TranslateDriver,
 
   TranslateManager* translate_manager_;
 
-  ObserverList<Observer, true> observer_list_;
+  base::ObserverList<Observer, true> observer_list_;
 
   // Max number of attempts before checking if a page has been reloaded.
   int max_reload_check_attempts_;
diff --git a/components/ui/zoom/zoom_controller.h b/components/ui/zoom/zoom_controller.h
index 0ea9f6b..f317b40 100644
--- a/components/ui/zoom/zoom_controller.h
+++ b/components/ui/zoom/zoom_controller.h
@@ -187,7 +187,7 @@ class ZoomController : public content::WebContentsObserver,
   scoped_refptr<const ZoomRequestClient> last_client_;
 
   // Observer receiving notifications on state changes.
-  ObserverList<ZoomObserver> observers_;
+  base::ObserverList<ZoomObserver> observers_;
 
   content::BrowserContext* browser_context_;
   // Keep track of the HostZoomMap we're currently subscribed to.
diff --git a/components/ui/zoom/zoom_event_manager.h b/components/ui/zoom/zoom_event_manager.h
index 72d335d..b18c3a4 100644
--- a/components/ui/zoom/zoom_event_manager.h
+++ b/components/ui/zoom/zoom_event_manager.h
@@ -60,7 +60,7 @@ class ZoomEventManager : public base::SupportsUserData::Data {
  private:
   base::CallbackList<void(const content::HostZoomMap::ZoomLevelChange&)>
       zoom_level_changed_callbacks_;
-  ObserverList<ZoomEventManagerObserver> observers_;
+  base::ObserverList<ZoomEventManagerObserver> observers_;
   base::WeakPtrFactory<ZoomEventManager> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ZoomEventManager);
diff --git a/components/undo/undo_manager.h b/components/undo/undo_manager.h
index ebbe1b4..0c0af8b 100644
--- a/components/undo/undo_manager.h
+++ b/components/undo/undo_manager.h
@@ -109,7 +109,7 @@ class UndoManager {
   ScopedVector<UndoGroup> redo_actions_;
 
   // The observers to notify when internal state changes.
-  ObserverList<UndoManagerObserver> observers_;
+  base::ObserverList<UndoManagerObserver> observers_;
 
   // Supports grouping operations into a single undo action.
   int group_actions_count_;
diff --git a/components/update_client/update_client_internal.h b/components/update_client/update_client_internal.h
index 0ace882..74041a0 100644
--- a/components/update_client/update_client_internal.h
+++ b/components/update_client/update_client_internal.h
@@ -75,7 +75,7 @@ class UpdateClientImpl : public UpdateClient {
   scoped_ptr<PingManager> ping_manager_;
   scoped_ptr<UpdateEngine> update_engine_;
 
-  ObserverList<Observer> observer_list_;
+  base::ObserverList<Observer> observer_list_;
 
   // Used to post responses back to the main thread.
   scoped_refptr<base::SingleThreadTaskRunner> main_task_runner_;
diff --git a/components/user_manager/user_manager_base.h b/components/user_manager/user_manager_base.h
index d8454efa..7007681 100644
--- a/components/user_manager/user_manager_base.h
+++ b/components/user_manager/user_manager_base.h
@@ -396,10 +396,10 @@ class USER_MANAGER_EXPORT UserManagerBase : public UserManager {
   // been read from trusted device policy yet.
   std::string owner_email_;
 
-  ObserverList<UserManager::Observer> observer_list_;
+  base::ObserverList<UserManager::Observer> observer_list_;
 
   // TODO(nkostylev): Merge with session state refactoring CL.
-  ObserverList<UserManager::UserSessionStateObserver>
+  base::ObserverList<UserManager::UserSessionStateObserver>
       session_state_observer_list_;
 
   // Time at which this object was created.
diff --git a/components/view_manager/animation_runner.h b/components/view_manager/animation_runner.h
index 99a169e..547190e 100644
--- a/components/view_manager/animation_runner.h
+++ b/components/view_manager/animation_runner.h
@@ -100,7 +100,7 @@ class AnimationRunner {
 
   base::TimeTicks last_tick_time_;
 
-  ObserverList<AnimationRunnerObserver> observers_;
+  base::ObserverList<AnimationRunnerObserver> observers_;
 
   ViewToAnimationMap view_to_animation_map_;
 
diff --git a/components/view_manager/public/cpp/lib/view_private.h b/components/view_manager/public/cpp/lib/view_private.h
index a63711e..5ab071a 100644
--- a/components/view_manager/public/cpp/lib/view_private.h
+++ b/components/view_manager/public/cpp/lib/view_private.h
@@ -19,7 +19,7 @@ class ViewPrivate {
   // Creates and returns a new View. Caller owns the return value.
   static View* LocalCreate();
 
-  ObserverList<ViewObserver>* observers() { return &view_->observers_; }
+  base::ObserverList<ViewObserver>* observers() { return &view_->observers_; }
 
   void ClearParent() { view_->parent_ = NULL; }
 
diff --git a/components/view_manager/public/cpp/view.h b/components/view_manager/public/cpp/view.h
index 8df4d1c..311d89d 100644
--- a/components/view_manager/public/cpp/view.h
+++ b/components/view_manager/public/cpp/view.h
@@ -187,7 +187,7 @@ class View {
   View* parent_;
   Children children_;
 
-  ObserverList<ViewObserver> observers_;
+  base::ObserverList<ViewObserver> observers_;
 
   Rect bounds_;
   ViewportMetricsPtr viewport_metrics_;
diff --git a/components/view_manager/server_view.cc b/components/view_manager/server_view.cc
index 344d2a8..d916afa 100644
--- a/components/view_manager/server_view.cc
+++ b/components/view_manager/server_view.cc
@@ -21,7 +21,7 @@ ServerView::ServerView(ServerViewDelegate* delegate, const ViewId& id)
       // Don't notify newly added observers during notification. This causes
       // problems for code that adds an observer as part of an observer
       // notification (such as ServerViewDrawTracker).
-      observers_(ObserverList<ServerViewObserver>::NOTIFY_EXISTING_ONLY) {
+      observers_(base::ObserverList<ServerViewObserver>::NOTIFY_EXISTING_ONLY) {
   DCHECK(delegate);  // Must provide a delegate.
 }
 
diff --git a/components/view_manager/server_view.h b/components/view_manager/server_view.h
index b307ffd..afe54c7 100644
--- a/components/view_manager/server_view.h
+++ b/components/view_manager/server_view.h
@@ -110,7 +110,7 @@ class ServerView {
 
   std::map<std::string, std::vector<uint8_t>> properties_;
 
-  ObserverList<ServerViewObserver> observers_;
+  base::ObserverList<ServerViewObserver> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(ServerView);
 };
diff --git a/components/wallpaper/wallpaper_manager_base.h b/components/wallpaper/wallpaper_manager_base.h
index ae1ddd6..9676ee2 100644
--- a/components/wallpaper/wallpaper_manager_base.h
+++ b/components/wallpaper/wallpaper_manager_base.h
@@ -589,7 +589,7 @@ class WALLPAPER_EXPORT WallpaperManagerBase
 
   content::NotificationRegistrar registrar_;
 
-  ObserverList<Observer> observers_;
+  base::ObserverList<Observer> observers_;
 
   // These members are for the scheduler:
 
diff --git a/components/wallpaper/wallpaper_resizer.h b/components/wallpaper/wallpaper_resizer.h
index a7ec1f0..21fb7db 100644
--- a/components/wallpaper/wallpaper_resizer.h
+++ b/components/wallpaper/wallpaper_resizer.h
@@ -56,7 +56,7 @@ class WALLPAPER_EXPORT WallpaperResizer {
   // has finished running.
   void OnResizeFinished(SkBitmap* resized_bitmap);
 
-  ObserverList<WallpaperResizerObserver> observers_;
+  base::ObserverList<WallpaperResizerObserver> observers_;
 
   // Image that should currently be used for wallpaper. It initially
   // contains the original image and is updated to contain the resized
diff --git a/content/browser/android/in_process/synchronous_compositor_factory_impl.cc b/content/browser/android/in_process/synchronous_compositor_factory_impl.cc
index bf1cff2..a57f8d4 100644
--- a/content/browser/android/in_process/synchronous_compositor_factory_impl.cc
+++ b/content/browser/android/in_process/synchronous_compositor_factory_impl.cc
@@ -115,7 +115,7 @@ class SynchronousCompositorFactoryImpl::VideoContextProvider
 
   scoped_refptr<cc::ContextProvider> context_provider_;
   gpu::GLInProcessContext* gl_in_process_context_;
-  ObserverList<StreamTextureFactoryContextObserver> observer_list_;
+  base::ObserverList<StreamTextureFactoryContextObserver> observer_list_;
 
   DISALLOW_COPY_AND_ASSIGN(VideoContextProvider);
 };
diff --git a/content/browser/appcache/appcache_group.cc b/content/browser/appcache/appcache_group.cc
index ce6d873..4e16e7f 100644
--- a/content/browser/appcache/appcache_group.cc
+++ b/content/browser/appcache/appcache_group.cc
@@ -222,7 +222,7 @@ void AppCacheGroup::RunQueuedUpdates() {
 // static
 bool AppCacheGroup::FindObserver(
     const UpdateObserver* find_me,
-    const ObserverList<UpdateObserver>& observer_list) {
+    const base::ObserverList<UpdateObserver>& observer_list) {
   return observer_list.HasObserver(find_me);
 }
 
diff --git a/content/browser/appcache/appcache_group.h b/content/browser/appcache/appcache_group.h
index 1a2df75..cafa3ef 100644
--- a/content/browser/appcache/appcache_group.h
+++ b/content/browser/appcache/appcache_group.h
@@ -122,8 +122,9 @@ class CONTENT_EXPORT AppCacheGroup
   // Update cannot be processed at this time. Queue it for a later run.
   void QueueUpdate(AppCacheHost* host, const GURL& new_master_resource);
   void RunQueuedUpdates();
-  static bool FindObserver(const UpdateObserver* find_me,
-                           const ObserverList<UpdateObserver>& observer_list);
+  static bool FindObserver(
+      const UpdateObserver* find_me,
+      const base::ObserverList<UpdateObserver>& observer_list);
   void ScheduleUpdateRestart(int delay_ms);
   void HostDestructionImminent(AppCacheHost* host);
 
@@ -148,11 +149,11 @@ class CONTENT_EXPORT AppCacheGroup
   AppCacheStorage* storage_;
 
   // List of objects observing this group.
-  ObserverList<UpdateObserver> observers_;
+  base::ObserverList<UpdateObserver> observers_;
 
   // Updates that have been queued for the next run.
   QueuedUpdates queued_updates_;
-  ObserverList<UpdateObserver> queued_observers_;
+  base::ObserverList<UpdateObserver> queued_observers_;
   base::CancelableClosure restart_update_task_;
   scoped_ptr<HostObserver> host_observer_;
 
diff --git a/content/browser/appcache/appcache_host.h b/content/browser/appcache/appcache_host.h
index f439520..82029ba 100644
--- a/content/browser/appcache/appcache_host.h
+++ b/content/browser/appcache/appcache_host.h
@@ -317,7 +317,7 @@ class CONTENT_EXPORT AppCacheHost
   bool associated_cache_info_pending_;
 
   // List of objects observing us.
-  ObserverList<Observer> observers_;
+  base::ObserverList<Observer> observers_;
 
   // Used to inform the QuotaManager of what origins are currently in use.
   GURL origin_in_use_;
diff --git a/content/browser/appcache/appcache_service_impl.h b/content/browser/appcache/appcache_service_impl.h
index cb61f3a..07d89cc 100644
--- a/content/browser/appcache/appcache_service_impl.h
+++ b/content/browser/appcache/appcache_service_impl.h
@@ -212,7 +212,7 @@ class CONTENT_EXPORT AppCacheServiceImpl
   base::Time last_reinit_time_;
   base::TimeDelta next_reinit_delay_;
   base::OneShotTimer<AppCacheServiceImpl> reinit_timer_;
-  ObserverList<Observer> observers_;
+  base::ObserverList<Observer> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(AppCacheServiceImpl);
 };
diff --git a/content/browser/compositor/gpu_process_transport_factory.h b/content/browser/compositor/gpu_process_transport_factory.h
index 6c460fa..bc8ce95 100644
--- a/content/browser/compositor/gpu_process_transport_factory.h
+++ b/content/browser/compositor/gpu_process_transport_factory.h
@@ -97,7 +97,7 @@ class GpuProcessTransportFactory
   PerCompositorDataMap per_compositor_data_;
   scoped_refptr<ContextProviderCommandBuffer> shared_main_thread_contexts_;
   scoped_ptr<GLHelper> gl_helper_;
-  ObserverList<ImageTransportFactoryObserver> observer_list_;
+  base::ObserverList<ImageTransportFactoryObserver> observer_list_;
   scoped_ptr<cc::SurfaceManager> surface_manager_;
   uint32_t next_surface_id_namespace_;
   scoped_ptr<cc::TaskGraphRunner> task_graph_runner_;
diff --git a/content/browser/compositor/test/no_transport_image_transport_factory.h b/content/browser/compositor/test/no_transport_image_transport_factory.h
index e67a09d..5397ea2 100644
--- a/content/browser/compositor/test/no_transport_image_transport_factory.h
+++ b/content/browser/compositor/test/no_transport_image_transport_factory.h
@@ -41,7 +41,7 @@ class NoTransportImageTransportFactory : public ImageTransportFactory {
   scoped_ptr<ui::ContextFactory> context_factory_;
   scoped_refptr<cc::ContextProvider> context_provider_;
   scoped_ptr<GLHelper> gl_helper_;
-  ObserverList<ImageTransportFactoryObserver> observer_list_;
+  base::ObserverList<ImageTransportFactoryObserver> observer_list_;
 
   DISALLOW_COPY_AND_ASSIGN(NoTransportImageTransportFactory);
 };
diff --git a/content/browser/devtools/service_worker_devtools_manager.h b/content/browser/devtools/service_worker_devtools_manager.h
index 8815fef..1c9f75b 100644
--- a/content/browser/devtools/service_worker_devtools_manager.h
+++ b/content/browser/devtools/service_worker_devtools_manager.h
@@ -110,7 +110,7 @@ class CONTENT_EXPORT ServiceWorkerDevToolsManager {
   // Resets to its initial state as if newly created.
   void ResetForTesting();
 
-  ObserverList<Observer> observer_list_;
+  base::ObserverList<Observer> observer_list_;
   AgentHostMap workers_;
   bool debug_service_worker_on_start_;
 
diff --git a/content/browser/dom_storage/dom_storage_context_impl.h b/content/browser/dom_storage/dom_storage_context_impl.h
index f71ab6a..c2b72be 100644
--- a/content/browser/dom_storage/dom_storage_context_impl.h
+++ b/content/browser/dom_storage/dom_storage_context_impl.h
@@ -205,7 +205,7 @@ class CONTENT_EXPORT DOMStorageContextImpl
   scoped_refptr<DOMStorageTaskRunner> task_runner_;
 
   // List of objects observing local storage events.
-  ObserverList<EventObserver> event_observers_;
+  base::ObserverList<EventObserver> event_observers_;
 
   // We use a 32 bit identifier for per tab storage sessions.
   // At a tab per second, this range is large enough for 68 years.
diff --git a/content/browser/download/download_item_impl.h b/content/browser/download/download_item_impl.h
index 50b3dbd..37041ca 100644
--- a/content/browser/download/download_item_impl.h
+++ b/content/browser/download/download_item_impl.h
@@ -493,7 +493,7 @@ class CONTENT_EXPORT DownloadItemImpl
   DownloadDangerType danger_type_;
 
   // The views of this item in the download shelf and download contents.
-  ObserverList<Observer> observers_;
+  base::ObserverList<Observer> observers_;
 
   // Time the download was started.
   base::Time start_time_;
diff --git a/content/browser/download/download_manager_impl.h b/content/browser/download/download_manager_impl.h
index 0c9c33b..9c9d12d 100644
--- a/content/browser/download/download_manager_impl.h
+++ b/content/browser/download/download_manager_impl.h
@@ -177,7 +177,7 @@ class CONTENT_EXPORT DownloadManagerImpl : public DownloadManager,
   bool shutdown_needed_;
 
   // Observers that want to be notified of changes to the set of downloads.
-  ObserverList<Observer> observers_;
+  base::ObserverList<Observer> observers_;
 
   // The current active browser context.
   BrowserContext* browser_context_;
diff --git a/content/browser/gpu/gpu_data_manager_impl_private.h b/content/browser/gpu/gpu_data_manager_impl_private.h
index 2a2b0c1..ae7a879 100644
--- a/content/browser/gpu/gpu_data_manager_impl_private.h
+++ b/content/browser/gpu/gpu_data_manager_impl_private.h
@@ -169,7 +169,7 @@ class CONTENT_EXPORT GpuDataManagerImplPrivate {
 
   typedef std::map<std::string, DomainBlockEntry> DomainBlockMap;
 
-  typedef ObserverListThreadSafe<GpuDataManagerObserver>
+  typedef base::ObserverListThreadSafe<GpuDataManagerObserver>
       GpuDataManagerObserverList;
 
   struct LogMessage {
diff --git a/content/browser/loader/resource_dispatcher_host_impl.cc b/content/browser/loader/resource_dispatcher_host_impl.cc
index 2648ea6..baaf2f9 100644
--- a/content/browser/loader/resource_dispatcher_host_impl.cc
+++ b/content/browser/loader/resource_dispatcher_host_impl.cc
@@ -989,7 +989,7 @@ bool ResourceDispatcherHostImpl::OnMessageReceived(
     GlobalRequestID id(filter_->child_id(), request_id);
     DelegateMap::iterator it = delegate_map_.find(id);
     if (it != delegate_map_.end()) {
-      ObserverList<ResourceMessageDelegate>::Iterator del_it(it->second);
+      base::ObserverList<ResourceMessageDelegate>::Iterator del_it(it->second);
       ResourceMessageDelegate* delegate;
       while (!handled && (delegate = del_it.GetNext()) != NULL) {
         handled = delegate->OnMessageReceived(message);
@@ -1096,7 +1096,7 @@ void ResourceDispatcherHostImpl::UpdateRequestForTransfer(
     DelegateMap::iterator it = delegate_map_.find(old_request_id);
     if (it != delegate_map_.end()) {
       // Tell each delegate that the request ID has changed.
-      ObserverList<ResourceMessageDelegate>::Iterator del_it(it->second);
+      base::ObserverList<ResourceMessageDelegate>::Iterator del_it(it->second);
       ResourceMessageDelegate* delegate;
       while ((delegate = del_it.GetNext()) != NULL) {
         delegate->set_request_id(new_request_id);
@@ -2310,7 +2310,10 @@ void ResourceDispatcherHostImpl::RegisterResourceMessageDelegate(
   DelegateMap::iterator it = delegate_map_.find(id);
   if (it == delegate_map_.end()) {
     it = delegate_map_.insert(
-        std::make_pair(id, new ObserverList<ResourceMessageDelegate>)).first;
+                           std::make_pair(
+                               id,
+                               new base::ObserverList<ResourceMessageDelegate>))
+             .first;
   }
   it->second->AddObserver(delegate);
 }
diff --git a/content/browser/loader/resource_dispatcher_host_impl.h b/content/browser/loader/resource_dispatcher_host_impl.h
index 51d5b73..31d94aa 100644
--- a/content/browser/loader/resource_dispatcher_host_impl.h
+++ b/content/browser/loader/resource_dispatcher_host_impl.h
@@ -574,7 +574,7 @@ class CONTENT_EXPORT ResourceDispatcherHostImpl
   std::set<const ResourceContext*> active_resource_contexts_;
 
   typedef std::map<GlobalRequestID,
-                   ObserverList<ResourceMessageDelegate>*> DelegateMap;
+                   base::ObserverList<ResourceMessageDelegate>*> DelegateMap;
   DelegateMap delegate_map_;
 
   scoped_ptr<ResourceScheduler> scheduler_;
diff --git a/content/browser/media/webrtc_internals.h b/content/browser/media/webrtc_internals.h
index e443531..8ad1f2c 100644
--- a/content/browser/media/webrtc_internals.h
+++ b/content/browser/media/webrtc_internals.h
@@ -137,7 +137,7 @@ class CONTENT_EXPORT WebRTCInternals : public RenderProcessHostObserver,
   // application for power-saving.
   void CreateOrReleasePowerSaveBlocker();
 
-  ObserverList<WebRTCInternalsUIObserver> observers_;
+  base::ObserverList<WebRTCInternalsUIObserver> observers_;
 
   // |peer_connection_data_| is a list containing all the PeerConnection
   // updates.
diff --git a/content/browser/notification_service_impl.h b/content/browser/notification_service_impl.h
index 6704fe4..8a74c75 100644
--- a/content/browser/notification_service_impl.h
+++ b/content/browser/notification_service_impl.h
@@ -33,7 +33,7 @@ class CONTENT_EXPORT NotificationServiceImpl : public NotificationService {
  private:
   friend class NotificationRegistrar;
 
-  typedef ObserverList<NotificationObserver> NotificationObserverList;
+  typedef base::ObserverList<NotificationObserver> NotificationObserverList;
   typedef std::map<uintptr_t, NotificationObserverList*> NotificationSourceMap;
   typedef std::map<int, NotificationSourceMap> NotificationObserverMap;
   typedef std::map<int, int> NotificationObserverCount;
diff --git a/content/browser/power_profiler/power_profiler_service.h b/content/browser/power_profiler/power_profiler_service.h
index 4daae28f..1529520 100644
--- a/content/browser/power_profiler/power_profiler_service.h
+++ b/content/browser/power_profiler/power_profiler_service.h
@@ -66,7 +66,7 @@ class CONTENT_EXPORT PowerProfilerService {
 
   // Sampling period of power data measurement.
   base::TimeDelta sample_period_;
-  ObserverList<PowerProfilerObserver> observers_;
+  base::ObserverList<PowerProfilerObserver> observers_;
 
   scoped_ptr<PowerDataProvider> data_provider_;
 
diff --git a/content/browser/renderer_host/pepper/browser_ppapi_host_impl.h b/content/browser/renderer_host/pepper/browser_ppapi_host_impl.h
index a29eb7e..d851434 100644
--- a/content/browser/renderer_host/pepper/browser_ppapi_host_impl.h
+++ b/content/browser/renderer_host/pepper/browser_ppapi_host_impl.h
@@ -138,7 +138,7 @@ class CONTENT_EXPORT BrowserPpapiHostImpl : public BrowserPpapiHost {
     PepperRendererInstanceData renderer_data;
     bool is_throttled;
 
-    ObserverList<InstanceObserver> observer_list;
+    base::ObserverList<InstanceObserver> observer_list;
   };
 
   // Reports plugin activity to the callback set with SetOnKeepaliveCallback.
diff --git a/content/browser/renderer_host/render_process_host_impl.h b/content/browser/renderer_host/render_process_host_impl.h
index cce983d..21694dc 100644
--- a/content/browser/renderer_host/render_process_host_impl.h
+++ b/content/browser/renderer_host/render_process_host_impl.h
@@ -412,7 +412,7 @@ class CONTENT_EXPORT RenderProcessHostImpl
   StoragePartitionImpl* storage_partition_impl_;
 
   // The observers watching our lifetime.
-  ObserverList<RenderProcessHostObserver> observers_;
+  base::ObserverList<RenderProcessHostObserver> observers_;
 
   // True if the process can be shut down suddenly.  If this is true, then we're
   // sure that all the RenderViews in the process can be shutdown suddenly.  If
diff --git a/content/browser/renderer_host/render_widget_host_view_aura_unittest.cc b/content/browser/renderer_host/render_widget_host_view_aura_unittest.cc
index 839c35f..c780706 100644
--- a/content/browser/renderer_host/render_widget_host_view_aura_unittest.cc
+++ b/content/browser/renderer_host/render_widget_host_view_aura_unittest.cc
@@ -444,10 +444,11 @@ class RenderWidgetHostViewAuraTest : public testing::Test {
       base::MemoryPressureListener::MemoryPressureLevel level) {
     // Here should be base::MemoryPressureListener::NotifyMemoryPressure, but
     // since the RendererFrameManager is installing a MemoryPressureListener
-    // which uses ObserverListThreadSafe, which furthermore remembers the
+    // which uses base::ObserverListThreadSafe, which furthermore remembers the
     // message loop for the thread it was created in. Between tests, the
     // RendererFrameManager singleton survives and and the MessageLoop gets
-    // destroyed. The correct fix would be to have ObserverListThreadSafe look
+    // destroyed. The correct fix would be to have base::ObserverListThreadSafe
+    // look
     // up the proper message loop every time (see crbug.com/443824.)
     RendererFrameManager::GetInstance()->OnMemoryPressure(level);
   }
diff --git a/content/browser/service_worker/embedded_worker_instance.h b/content/browser/service_worker/embedded_worker_instance.h
index aebbe38..309c2dd 100644
--- a/content/browser/service_worker/embedded_worker_instance.h
+++ b/content/browser/service_worker/embedded_worker_instance.h
@@ -143,7 +143,7 @@ class CONTENT_EXPORT EmbeddedWorkerInstance {
   static std::string StartingPhaseToString(StartingPhase phase);
 
  private:
-  typedef ObserverList<Listener> ListenerList;
+  typedef base::ObserverList<Listener> ListenerList;
   class DevToolsProxy;
   friend class EmbeddedWorkerRegistry;
   FRIEND_TEST_ALL_PREFIXES(EmbeddedWorkerInstanceTest, StartAndStop);
diff --git a/content/browser/service_worker/service_worker_context_core.cc b/content/browser/service_worker/service_worker_context_core.cc
index aff1553..a76f774 100644
--- a/content/browser/service_worker/service_worker_context_core.cc
+++ b/content/browser/service_worker/service_worker_context_core.cc
@@ -131,7 +131,7 @@ ServiceWorkerContextCore::ServiceWorkerContextCore(
     const scoped_refptr<base::SingleThreadTaskRunner>& disk_cache_thread,
     storage::QuotaManagerProxy* quota_manager_proxy,
     storage::SpecialStoragePolicy* special_storage_policy,
-    ObserverListThreadSafe<ServiceWorkerContextObserver>* observer_list,
+    base::ObserverListThreadSafe<ServiceWorkerContextObserver>* observer_list,
     ServiceWorkerContextWrapper* wrapper)
     : wrapper_(wrapper),
       providers_(new ProcessToProviderMap),
diff --git a/content/browser/service_worker/service_worker_context_core.h b/content/browser/service_worker/service_worker_context_core.h
index c2aa08d6..1a6946a 100644
--- a/content/browser/service_worker/service_worker_context_core.h
+++ b/content/browser/service_worker/service_worker_context_core.h
@@ -106,7 +106,7 @@ class CONTENT_EXPORT ServiceWorkerContextCore
       const scoped_refptr<base::SingleThreadTaskRunner>& disk_cache_thread,
       storage::QuotaManagerProxy* quota_manager_proxy,
       storage::SpecialStoragePolicy* special_storage_policy,
-      ObserverListThreadSafe<ServiceWorkerContextObserver>* observer_list,
+      base::ObserverListThreadSafe<ServiceWorkerContextObserver>* observer_list,
       ServiceWorkerContextWrapper* wrapper);
   ServiceWorkerContextCore(
       ServiceWorkerContextCore* old_context,
@@ -252,7 +252,7 @@ class CONTENT_EXPORT ServiceWorkerContextCore
   std::map<int64, ServiceWorkerVersion*> live_versions_;
   int next_handle_id_;
   int next_registration_handle_id_;
-  scoped_refptr<ObserverListThreadSafe<ServiceWorkerContextObserver> >
+  scoped_refptr<base::ObserverListThreadSafe<ServiceWorkerContextObserver>>
       observer_list_;
   base::WeakPtrFactory<ServiceWorkerContextCore> weak_factory_;
 
diff --git a/content/browser/service_worker/service_worker_context_wrapper.cc b/content/browser/service_worker/service_worker_context_wrapper.cc
index 5ac00ae..d4a189c 100644
--- a/content/browser/service_worker/service_worker_context_wrapper.cc
+++ b/content/browser/service_worker/service_worker_context_wrapper.cc
@@ -101,7 +101,7 @@ ServiceWorkerContext* ServiceWorkerContext::GetServiceWorkerContext(
 ServiceWorkerContextWrapper::ServiceWorkerContextWrapper(
     BrowserContext* browser_context)
     : observer_list_(
-          new ObserverListThreadSafe<ServiceWorkerContextObserver>()),
+          new base::ObserverListThreadSafe<ServiceWorkerContextObserver>()),
       process_manager_(new ServiceWorkerProcessManager(browser_context)),
       is_incognito_(false),
       storage_partition_(nullptr) {
diff --git a/content/browser/service_worker/service_worker_context_wrapper.h b/content/browser/service_worker/service_worker_context_wrapper.h
index 0e5dab0..558ecad 100644
--- a/content/browser/service_worker/service_worker_context_wrapper.h
+++ b/content/browser/service_worker/service_worker_context_wrapper.h
@@ -172,8 +172,8 @@ class CONTENT_EXPORT ServiceWorkerContextWrapper
   // DeleteAndStartOver fails.
   ServiceWorkerContextCore* context();
 
-  const scoped_refptr<ObserverListThreadSafe<ServiceWorkerContextObserver> >
-      observer_list_;
+  const scoped_refptr<base::ObserverListThreadSafe<
+      ServiceWorkerContextObserver>> observer_list_;
   const scoped_ptr<ServiceWorkerProcessManager> process_manager_;
   // Cleared in Shutdown():
   scoped_ptr<ServiceWorkerContextCore> context_core_;
diff --git a/content/browser/service_worker/service_worker_registration.h b/content/browser/service_worker/service_worker_registration.h
index 9ed212b..8da2969 100644
--- a/content/browser/service_worker/service_worker_registration.h
+++ b/content/browser/service_worker/service_worker_registration.h
@@ -180,7 +180,7 @@ class CONTENT_EXPORT ServiceWorkerRegistration
   scoped_refptr<ServiceWorkerVersion> active_version_;
   scoped_refptr<ServiceWorkerVersion> waiting_version_;
   scoped_refptr<ServiceWorkerVersion> installing_version_;
-  ObserverList<Listener> listeners_;
+  base::ObserverList<Listener> listeners_;
   base::WeakPtr<ServiceWorkerContextCore> context_;
 
   DISALLOW_COPY_AND_ASSIGN(ServiceWorkerRegistration);
diff --git a/content/browser/service_worker/service_worker_version.h b/content/browser/service_worker/service_worker_version.h
index f521709..39fa417 100644
--- a/content/browser/service_worker/service_worker_version.h
+++ b/content/browser/service_worker/service_worker_version.h
@@ -534,7 +534,7 @@ class CONTENT_EXPORT ServiceWorkerVersion
   std::map<std::string, ServiceWorkerProviderHost*> controllee_map_;
   // Will be null while shutting down.
   base::WeakPtr<ServiceWorkerContextCore> context_;
-  ObserverList<Listener> listeners_;
+  base::ObserverList<Listener> listeners_;
   ServiceWorkerScriptCacheMap script_cache_map_;
   base::OneShotTimer<ServiceWorkerVersion> update_timer_;
 
diff --git a/content/browser/shared_worker/shared_worker_service_impl.h b/content/browser/shared_worker/shared_worker_service_impl.h
index f1fa702..c16bad4 100644
--- a/content/browser/shared_worker/shared_worker_service_impl.h
+++ b/content/browser/shared_worker/shared_worker_service_impl.h
@@ -168,7 +168,7 @@ class CONTENT_EXPORT SharedWorkerServiceImpl
   PendingInstaneMap pending_instances_;
   int next_pending_instance_id_;
 
-  ObserverList<WorkerServiceObserver> observers_;
+  base::ObserverList<WorkerServiceObserver> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(SharedWorkerServiceImpl);
 };
diff --git a/content/browser/web_contents/web_contents_impl.h b/content/browser/web_contents/web_contents_impl.h
index a6c6211..8a46227 100644
--- a/content/browser/web_contents/web_contents_impl.h
+++ b/content/browser/web_contents/web_contents_impl.h
@@ -1015,7 +1015,7 @@ class CONTENT_EXPORT WebContentsImpl
   // This MUST be listed above frame_tree_ since at destruction time the
   // latter might cause RenderViewHost's destructor to call us and we might use
   // the observer list then.
-  ObserverList<WebContentsObserver> observers_;
+  base::ObserverList<WebContentsObserver> observers_;
 
   // The tab that opened this tab, if any.  Will be set to null if the opener
   // is closed.
diff --git a/content/child/worker_task_runner.cc b/content/child/worker_task_runner.cc
index 17b4e16..bd469c1 100644
--- a/content/child/worker_task_runner.cc
+++ b/content/child/worker_task_runner.cc
@@ -39,7 +39,7 @@ class DoNothingTaskRunner : public base::TaskRunner {
 
 struct WorkerTaskRunner::ThreadLocalState {
   ThreadLocalState() {}
-  ObserverList<WorkerTaskRunner::Observer> stop_observers_;
+  base::ObserverList<WorkerTaskRunner::Observer> stop_observers_;
 };
 
 WorkerTaskRunner::WorkerTaskRunner()
diff --git a/content/common/gpu/client/command_buffer_proxy_impl.h b/content/common/gpu/client/command_buffer_proxy_impl.h
index 9f85bb2..cf73174 100644
--- a/content/common/gpu/client/command_buffer_proxy_impl.h
+++ b/content/common/gpu/client/command_buffer_proxy_impl.h
@@ -196,7 +196,7 @@ class CommandBufferProxyImpl
   base::Lock* lock_;
 
   // Unowned list of DeletionObservers.
-  ObserverList<DeletionObserver> deletion_observers_;
+  base::ObserverList<DeletionObserver> deletion_observers_;
 
   // The last cached state received from the service.
   State last_state_;
diff --git a/content/common/gpu/gpu_command_buffer_stub.h b/content/common/gpu/gpu_command_buffer_stub.h
index 24ba37a..52f319e 100644
--- a/content/common/gpu/gpu_command_buffer_stub.h
+++ b/content/common/gpu/gpu_command_buffer_stub.h
@@ -266,7 +266,7 @@ class GpuCommandBufferStub
 
   GpuWatchdog* watchdog_;
 
-  ObserverList<DestructionObserver> destruction_observers_;
+  base::ObserverList<DestructionObserver> destruction_observers_;
 
   // A queue of sync points associated with this stub.
   std::deque<uint32> sync_points_;
diff --git a/content/public/test/mock_download_item.h b/content/public/test/mock_download_item.h
index 2b1f8b7..7d4ec36 100644
--- a/content/public/test/mock_download_item.h
+++ b/content/public/test/mock_download_item.h
@@ -102,7 +102,7 @@ class MockDownloadItem : public DownloadItem {
   MOCK_CONST_METHOD1(DebugString, std::string(bool));
 
  private:
-  ObserverList<Observer> observers_;
+  base::ObserverList<Observer> observers_;
 };
 
 }  // namespace content
diff --git a/content/public/test/mock_render_process_host.h b/content/public/test/mock_render_process_host.h
index 8bb361c..8911418 100644
--- a/content/public/test/mock_render_process_host.h
+++ b/content/public/test/mock_render_process_host.h
@@ -127,7 +127,7 @@ class MockRenderProcessHost : public RenderProcessHost {
   int id_;
   bool has_connection_;
   BrowserContext* browser_context_;
-  ObserverList<RenderProcessHostObserver> observers_;
+  base::ObserverList<RenderProcessHostObserver> observers_;
 
   IDMap<RenderWidgetHost> render_widget_hosts_;
   int prev_routing_id_;
diff --git a/content/public/test/mock_render_thread.h b/content/public/test/mock_render_thread.h
index 5783c09..9ce49ec 100644
--- a/content/public/test/mock_render_thread.h
+++ b/content/public/test/mock_render_thread.h
@@ -110,9 +110,7 @@ class MockRenderThread : public RenderThread {
   // Dispatches control messages to observers.
   bool OnControlMessageReceived(const IPC::Message& msg);
 
-  ObserverList<RenderProcessObserver>& observers() {
-    return observers_;
-  }
+  base::ObserverList<RenderProcessObserver>& observers() { return observers_; }
 
  protected:
   // This function operates as a regular IPC listener. Subclasses
@@ -170,7 +168,7 @@ class MockRenderThread : public RenderThread {
   std::vector<scoped_refptr<IPC::MessageFilter> > filters_;
 
   // Observers to notify.
-  ObserverList<RenderProcessObserver> observers_;
+  base::ObserverList<RenderProcessObserver> observers_;
 
   cc::TestSharedBitmapManager shared_bitmap_manager_;
 };
diff --git a/content/renderer/p2p/socket_dispatcher.cc b/content/renderer/p2p/socket_dispatcher.cc
index 2e81c6d..27fed68 100644
--- a/content/renderer/p2p/socket_dispatcher.cc
+++ b/content/renderer/p2p/socket_dispatcher.cc
@@ -21,7 +21,7 @@ P2PSocketDispatcher::P2PSocketDispatcher(
     : ipc_task_runner_(ipc_task_runner),
       network_notifications_started_(false),
       network_list_observers_(
-          new ObserverListThreadSafe<NetworkListObserver>()),
+          new base::ObserverListThreadSafe<NetworkListObserver>()),
       sender_(NULL) {
 }
 
diff --git a/content/renderer/p2p/socket_dispatcher.h b/content/renderer/p2p/socket_dispatcher.h
index ac8db56..c394113 100644
--- a/content/renderer/p2p/socket_dispatcher.h
+++ b/content/renderer/p2p/socket_dispatcher.h
@@ -109,7 +109,7 @@ class CONTENT_EXPORT P2PSocketDispatcher : public IPC::MessageFilter,
   IDMap<P2PAsyncAddressResolver> host_address_requests_;
 
   bool network_notifications_started_;
-  scoped_refptr<ObserverListThreadSafe<NetworkListObserver> >
+  scoped_refptr<base::ObserverListThreadSafe<NetworkListObserver>>
       network_list_observers_;
 
   IPC::Sender* sender_;
diff --git a/content/renderer/pepper/plugin_instance_throttler_impl.h b/content/renderer/pepper/plugin_instance_throttler_impl.h
index ec3eed68..30e90fe 100644
--- a/content/renderer/pepper/plugin_instance_throttler_impl.h
+++ b/content/renderer/pepper/plugin_instance_throttler_impl.h
@@ -107,7 +107,7 @@ class CONTENT_EXPORT PluginInstanceThrottlerImpl
   bool audio_throttled_;
   base::DelayTimer<PluginInstanceThrottlerImpl> audio_throttled_frame_timeout_;
 
-  ObserverList<Observer> observer_list_;
+  base::ObserverList<Observer> observer_list_;
 
   base::WeakPtrFactory<PluginInstanceThrottlerImpl> weak_factory_;
 
diff --git a/content/renderer/render_frame_impl.h b/content/renderer/render_frame_impl.h
index d2506ee..85af039 100644
--- a/content/renderer/render_frame_impl.h
+++ b/content/renderer/render_frame_impl.h
@@ -855,7 +855,7 @@ class CONTENT_EXPORT RenderFrameImpl
   RendererWebCookieJarImpl cookie_jar_;
 
   // All the registered observers.
-  ObserverList<RenderFrameObserver> observers_;
+  base::ObserverList<RenderFrameObserver> observers_;
 
   scoped_refptr<ChildFrameCompositingHelper> compositing_helper_;
 
diff --git a/content/renderer/render_thread_impl.h b/content/renderer/render_thread_impl.h
index 68b9df6..0c8ee8f 100644
--- a/content/renderer/render_thread_impl.h
+++ b/content/renderer/render_thread_impl.h
@@ -574,7 +574,7 @@ class CONTENT_EXPORT RenderThreadImpl
   scoped_refptr<cc_blink::ContextProviderWebContext>
       shared_main_thread_contexts_;
 
-  ObserverList<RenderProcessObserver> observers_;
+  base::ObserverList<RenderProcessObserver> observers_;
 
   scoped_refptr<ContextProviderCommandBuffer> gpu_va_context_provider_;
 
diff --git a/content/renderer/render_view_impl.h b/content/renderer/render_view_impl.h
index 932e31a..114f31f 100644
--- a/content/renderer/render_view_impl.h
+++ b/content/renderer/render_view_impl.h
@@ -746,9 +746,7 @@ class CONTENT_EXPORT RenderViewImpl
   // to access RenderViewImpl state. The set of state variables are page-level
   // specific, so they don't belong in RenderFrameImpl and should remain in
   // this object.
-  ObserverList<RenderViewObserver>& observers() {
-    return observers_;
-  }
+  base::ObserverList<RenderViewObserver>& observers() { return observers_; }
 
   // TODO(nasko): Remove this method when we move to frame proxy objects, since
   // the concept of swapped out will be eliminated.
@@ -994,7 +992,7 @@ class CONTENT_EXPORT RenderViewImpl
 
   // All the registered observers.  We expect this list to be small, so vector
   // is fine.
-  ObserverList<RenderViewObserver> observers_;
+  base::ObserverList<RenderViewObserver> observers_;
 
   // Wraps the |webwidget_| as a MouseLockDispatcher::LockTarget interface.
   scoped_ptr<MouseLockDispatcher::LockTarget> webwidget_mouse_lock_target_;
diff --git a/content/renderer/render_widget.h b/content/renderer/render_widget.h
index 772f6a5..5b82c40 100644
--- a/content/renderer/render_widget.h
+++ b/content/renderer/render_widget.h
@@ -796,15 +796,15 @@ class CONTENT_EXPORT RenderWidget
 
   // Lists of RenderFrameProxy objects that need to be notified of
   // compositing-related events (e.g. DidCommitCompositorFrame).
-  ObserverList<RenderFrameProxy> render_frame_proxies_;
+  base::ObserverList<RenderFrameProxy> render_frame_proxies_;
 #if defined(VIDEO_HOLE)
-  ObserverList<RenderFrameImpl> video_hole_frames_;
+  base::ObserverList<RenderFrameImpl> video_hole_frames_;
 #endif  // defined(VIDEO_HOLE)
 
   // A list of RenderFrames associated with this RenderWidget. Notifications
   // are sent to each frame in the list for events such as changing
   // visibility state for example.
-  ObserverList<RenderFrameImpl> render_frames_;
+  base::ObserverList<RenderFrameImpl> render_frames_;
 
   ui::MenuSourceType context_menu_source_type_;
   bool has_host_context_menu_location_;
diff --git a/device/bluetooth/bluetooth_adapter.h b/device/bluetooth/bluetooth_adapter.h
index 7c87eb8..f5a2868 100644
--- a/device/bluetooth/bluetooth_adapter.h
+++ b/device/bluetooth/bluetooth_adapter.h
@@ -461,7 +461,7 @@ class DEVICE_BLUETOOTH_EXPORT BluetoothAdapter
       BluetoothDiscoverySession* discovery_session);
 
   // Observers of BluetoothAdapter, notified from implementation subclasses.
-  ObserverList<device::BluetoothAdapter::Observer> observers_;
+  base::ObserverList<device::BluetoothAdapter::Observer> observers_;
 
   // Devices paired with, connected to, discovered by, or visible to the
   // adapter. The key is the Bluetooth address of the device and the value is
diff --git a/device/bluetooth/bluetooth_advertisement.h b/device/bluetooth/bluetooth_advertisement.h
index f040e13..46f19b1 100644
--- a/device/bluetooth/bluetooth_advertisement.h
+++ b/device/bluetooth/bluetooth_advertisement.h
@@ -126,7 +126,7 @@ class DEVICE_BLUETOOTH_EXPORT BluetoothAdvertisement
 
   // List of observers interested in event notifications from us. Objects in
   // |observers_| are expected to outlive a BluetoothAdvertisement object.
-  ObserverList<BluetoothAdvertisement::Observer> observers_;
+  base::ObserverList<BluetoothAdvertisement::Observer> observers_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(BluetoothAdvertisement);
diff --git a/device/bluetooth/bluetooth_audio_sink_chromeos.h b/device/bluetooth/bluetooth_audio_sink_chromeos.h
index a284a1f..6261ace 100644
--- a/device/bluetooth/bluetooth_audio_sink_chromeos.h
+++ b/device/bluetooth/bluetooth_audio_sink_chromeos.h
@@ -208,7 +208,7 @@ class DEVICE_BLUETOOTH_EXPORT BluetoothAudioSinkChromeOS
 
   // List of observers interested in event notifications from us. Objects in
   // |observers_| are expected to outlive a BluetoothAudioSinkChromeOS object.
-  ObserverList<BluetoothAudioSink::Observer> observers_;
+  base::ObserverList<BluetoothAudioSink::Observer> observers_;
 
   // Note: This should remain the last member so it'll be destroyed and
   // invalidate its weak pointers before any other members are destroyed.
diff --git a/device/bluetooth/bluetooth_task_manager_win.h b/device/bluetooth/bluetooth_task_manager_win.h
index e8b7ae6..215acae 100644
--- a/device/bluetooth/bluetooth_task_manager_win.h
+++ b/device/bluetooth/bluetooth_task_manager_win.h
@@ -200,7 +200,7 @@ class DEVICE_BLUETOOTH_EXPORT BluetoothTaskManagerWin
   scoped_refptr<base::SequencedTaskRunner> bluetooth_task_runner_;
 
   // List of observers interested in event notifications.
-  ObserverList<Observer> observers_;
+  base::ObserverList<Observer> observers_;
 
   // Adapter handle owned by bluetooth task runner.
   base::win::ScopedHandle adapter_handle_;
diff --git a/device/core/device_monitor_win.h b/device/core/device_monitor_win.h
index f6bc5dc..e8becd7 100644
--- a/device/core/device_monitor_win.h
+++ b/device/core/device_monitor_win.h
@@ -41,7 +41,7 @@ class DeviceMonitorWin {
   void NotifyDeviceRemoved(const GUID& class_guid,
                            const std::string& device_path);
 
-  ObserverList<Observer> observer_list_;
+  base::ObserverList<Observer> observer_list_;
 };
 
 }  // namespace device
diff --git a/device/hid/device_monitor_linux.h b/device/hid/device_monitor_linux.h
index 8cec73a..d05e31b 100644
--- a/device/hid/device_monitor_linux.h
+++ b/device/hid/device_monitor_linux.h
@@ -63,7 +63,7 @@ class DeviceMonitorLinux : public base::MessageLoop::DestructionObserver,
   int monitor_fd_;
   base::MessagePumpLibevent::FileDescriptorWatcher monitor_watcher_;
 
-  ObserverList<Observer> observers_;
+  base::ObserverList<Observer> observers_;
 
   base::ThreadChecker thread_checker_;
 
diff --git a/device/hid/hid_service.h b/device/hid/hid_service.h
index 4a4d3ad..1634a64 100644
--- a/device/hid/hid_service.h
+++ b/device/hid/hid_service.h
@@ -89,7 +89,7 @@ class HidService {
   DeviceMap devices_;
   bool enumeration_ready_;
   std::vector<GetDevicesCallback> pending_enumerations_;
-  ObserverList<Observer> observer_list_;
+  base::ObserverList<Observer> observer_list_;
 
   DISALLOW_COPY_AND_ASSIGN(HidService);
 };
diff --git a/device/hid/input_service_linux.h b/device/hid/input_service_linux.h
index 7eda3bb..d13be95 100644
--- a/device/hid/input_service_linux.h
+++ b/device/hid/input_service_linux.h
@@ -84,7 +84,7 @@ class InputServiceLinux : public base::MessageLoop::DestructionObserver {
   bool CalledOnValidThread() const;
 
   DeviceMap devices_;
-  ObserverList<Observer> observers_;
+  base::ObserverList<Observer> observers_;
 
  private:
   friend struct base::DefaultDeleter<InputServiceLinux>;
diff --git a/device/media_transfer_protocol/media_transfer_protocol_manager.cc b/device/media_transfer_protocol/media_transfer_protocol_manager.cc
index 7e55cd9..898b393 100644
--- a/device/media_transfer_protocol/media_transfer_protocol_manager.cc
+++ b/device/media_transfer_protocol/media_transfer_protocol_manager.cc
@@ -671,7 +671,7 @@ class MediaTransferProtocolManagerImpl : public MediaTransferProtocolManager {
 #endif
 
   // Device attachment / detachment observers.
-  ObserverList<Observer> observers_;
+  base::ObserverList<Observer> observers_;
 
   // Map to keep track of attached storages by name.
   StorageInfoMap storage_info_map_;
diff --git a/device/nfc/nfc_adapter_chromeos.h b/device/nfc/nfc_adapter_chromeos.h
index 62ca341..1a8c248 100644
--- a/device/nfc/nfc_adapter_chromeos.h
+++ b/device/nfc/nfc_adapter_chromeos.h
@@ -98,7 +98,7 @@ class NfcAdapterChromeOS : public device::NfcAdapter,
   dbus::ObjectPath object_path_;
 
   // List of observers interested in event notifications from us.
-  ObserverList<device::NfcAdapter::Observer> observers_;
+  base::ObserverList<device::NfcAdapter::Observer> observers_;
 
   // Note: This should remain the last member so it'll be destroyed and
   // invalidate its weak pointers before any other members are destroyed.
diff --git a/device/nfc/nfc_peer_chromeos.h b/device/nfc/nfc_peer_chromeos.h
index db9e58b..645c42e 100644
--- a/device/nfc/nfc_peer_chromeos.h
+++ b/device/nfc/nfc_peer_chromeos.h
@@ -66,7 +66,7 @@ class NfcPeerChromeOS : public device::NfcPeer,
   device::NfcNdefMessage message_;
 
   // List of observers interested in event notifications from us.
-  ObserverList<device::NfcPeer::Observer> observers_;
+  base::ObserverList<device::NfcPeer::Observer> observers_;
 
   // Note: This should remain the last member so it'll be destroyed and
   // invalidate its weak pointers before any other members are destroyed.
diff --git a/device/nfc/nfc_tag_chromeos.h b/device/nfc/nfc_tag_chromeos.h
index acddcc5..d9a29d8 100644
--- a/device/nfc/nfc_tag_chromeos.h
+++ b/device/nfc/nfc_tag_chromeos.h
@@ -59,7 +59,7 @@ class NfcTagChromeOS : public device::NfcTag,
   scoped_ptr<NfcNdefTagTechnologyChromeOS> ndef_technology_;
 
   // List of observers interested in event notifications from us.
-  ObserverList<device::NfcTag::Observer> observers_;
+  base::ObserverList<device::NfcTag::Observer> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(NfcTagChromeOS);
 };
diff --git a/device/nfc/nfc_tag_technology_chromeos.h b/device/nfc/nfc_tag_technology_chromeos.h
index 1e78891..75f407c 100644
--- a/device/nfc/nfc_tag_technology_chromeos.h
+++ b/device/nfc/nfc_tag_technology_chromeos.h
@@ -67,7 +67,7 @@ class NfcNdefTagTechnologyChromeOS : public device::NfcNdefTagTechnology,
   device::NfcNdefMessage message_;
 
   // List of observers interested in event notifications from us.
-  ObserverList<device::NfcNdefTagTechnology::Observer> observers_;
+  base::ObserverList<device::NfcNdefTagTechnology::Observer> observers_;
 
   // D-Bus object path of the remote tag or device that this object operates
   // on.
diff --git a/device/usb/usb_service.h b/device/usb/usb_service.h
index 755462d..b185241 100644
--- a/device/usb/usb_service.h
+++ b/device/usb/usb_service.h
@@ -62,7 +62,7 @@ class UsbService : public base::NonThreadSafe {
   void NotifyDeviceAdded(scoped_refptr<UsbDevice> device);
   void NotifyDeviceRemoved(scoped_refptr<UsbDevice> device);
 
-  ObserverList<Observer, true> observer_list_;
+  base::ObserverList<Observer, true> observer_list_;
 
  private:
   friend void base::DeletePointer<UsbService>(UsbService* service);
diff --git a/extensions/browser/api/audio/audio_service_chromeos.cc b/extensions/browser/api/audio/audio_service_chromeos.cc
index b077d7b..0ac4711 100644
--- a/extensions/browser/api/audio/audio_service_chromeos.cc
+++ b/extensions/browser/api/audio/audio_service_chromeos.cc
@@ -57,7 +57,7 @@ class AudioServiceImpl : public AudioService,
   uint64_t GetIdFromStr(const std::string& id_str);
 
   // List of observers.
-  ObserverList<AudioService::Observer> observer_list_;
+  base::ObserverList<AudioService::Observer> observer_list_;
 
   chromeos::CrasAudioHandler* cras_audio_handler_;
 
diff --git a/extensions/browser/api/networking_private/networking_private_linux.h b/extensions/browser/api/networking_private/networking_private_linux.h
index e4b2171..041ade5 100644
--- a/extensions/browser/api/networking_private/networking_private_linux.h
+++ b/extensions/browser/api/networking_private/networking_private_linux.h
@@ -257,7 +257,8 @@ class NetworkingPrivateLinux : public NetworkingPrivateDelegate {
   // Holds the current mapping of known networks. Only access on |dbus_thread_|.
   scoped_ptr<NetworkMap> network_map_;
   // Observers to Network Events.
-  ObserverList<NetworkingPrivateDelegateObserver> network_events_observers_;
+  base::ObserverList<NetworkingPrivateDelegateObserver>
+      network_events_observers_;
 
   DISALLOW_COPY_AND_ASSIGN(NetworkingPrivateLinux);
 };
diff --git a/extensions/browser/api/networking_private/networking_private_service_client.h b/extensions/browser/api/networking_private/networking_private_service_client.h
index dfa87c0..246c69c 100644
--- a/extensions/browser/api/networking_private/networking_private_service_client.h
+++ b/extensions/browser/api/networking_private/networking_private_service_client.h
@@ -156,7 +156,8 @@ class NetworkingPrivateServiceClient
   // Callbacks to run when callback is called from WiFiService.
   ServiceCallbacksMap callbacks_map_;
   // Observers to Network Events.
-  ObserverList<NetworkingPrivateDelegateObserver> network_events_observers_;
+  base::ObserverList<NetworkingPrivateDelegateObserver>
+      network_events_observers_;
   // Interface to WiFiService. Used and deleted on the worker thread.
   scoped_ptr<wifi::WiFiService> wifi_service_;
   // Sequence token associated with wifi tasks.
diff --git a/extensions/browser/api/printer_provider_internal/printer_provider_internal_api.h b/extensions/browser/api/printer_provider_internal/printer_provider_internal_api.h
index 9e1da1a..bb62b33 100644
--- a/extensions/browser/api/printer_provider_internal/printer_provider_internal_api.h
+++ b/extensions/browser/api/printer_provider_internal/printer_provider_internal_api.h
@@ -84,7 +84,7 @@ class PrinterProviderInternalAPI : public BrowserContextKeyedAPI {
       int request_id,
       const core_api::printer_provider::PrinterInfo* printer_info);
 
-  ObserverList<PrinterProviderInternalAPIObserver> observers_;
+  base::ObserverList<PrinterProviderInternalAPIObserver> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(PrinterProviderInternalAPI);
 };
diff --git a/extensions/browser/api/storage/settings_observer.h b/extensions/browser/api/storage/settings_observer.h
index b2c222d..daa7e69 100644
--- a/extensions/browser/api/storage/settings_observer.h
+++ b/extensions/browser/api/storage/settings_observer.h
@@ -22,8 +22,7 @@ class SettingsObserver {
   virtual ~SettingsObserver() {}
 };
 
-typedef ObserverListThreadSafe<SettingsObserver>
-    SettingsObserverList;
+typedef base::ObserverListThreadSafe<SettingsObserver> SettingsObserverList;
 
 }  // namespace extensions
 
diff --git a/extensions/browser/app_window/app_window_geometry_cache.h b/extensions/browser/app_window/app_window_geometry_cache.h
index 89732f4..314db45 100644
--- a/extensions/browser/app_window/app_window_geometry_cache.h
+++ b/extensions/browser/app_window/app_window_geometry_cache.h
@@ -149,7 +149,7 @@ class AppWindowGeometryCache : public KeyedService,
   ScopedObserver<ExtensionRegistry, ExtensionRegistryObserver>
       extension_registry_observer_;
 
-  ObserverList<Observer> observers_;
+  base::ObserverList<Observer> observers_;
 };
 
 }  // namespace extensions
diff --git a/extensions/browser/app_window/app_window_registry.h b/extensions/browser/app_window/app_window_registry.h
index ed2cdc6..fc9cc19 100644
--- a/extensions/browser/app_window/app_window_registry.h
+++ b/extensions/browser/app_window/app_window_registry.h
@@ -138,7 +138,7 @@ class AppWindowRegistry : public KeyedService {
   content::BrowserContext* context_;
   AppWindowList app_windows_;
   InspectedWindowSet inspected_windows_;
-  ObserverList<Observer> observers_;
+  base::ObserverList<Observer> observers_;
   base::Callback<void(content::DevToolsAgentHost*, bool)> devtools_callback_;
 };
 
diff --git a/extensions/browser/extension_host.h b/extensions/browser/extension_host.h
index 3ae0d86..846eb50 100644
--- a/extensions/browser/extension_host.h
+++ b/extensions/browser/extension_host.h
@@ -209,8 +209,8 @@ class ExtensionHost : public DeferredStartRenderHost,
   // started only once the ExtensionHost has exited the ExtensionHostQueue.
   scoped_ptr<base::ElapsedTimer> load_start_;
 
-  ObserverList<ExtensionHostObserver> observer_list_;
-  ObserverList<DeferredStartRenderHostObserver>
+  base::ObserverList<ExtensionHostObserver> observer_list_;
+  base::ObserverList<DeferredStartRenderHostObserver>
       deferred_start_render_host_observer_list_;
 
   DISALLOW_COPY_AND_ASSIGN(ExtensionHost);
diff --git a/extensions/browser/extension_icon_image.h b/extensions/browser/extension_icon_image.h
index e725a85..2abd55f 100644
--- a/extensions/browser/extension_icon_image.h
+++ b/extensions/browser/extension_icon_image.h
@@ -105,7 +105,7 @@ class IconImage : public content::NotificationObserver {
   const ExtensionIconSet& icon_set_;
   const int resource_size_in_dip_;
 
-  ObserverList<Observer> observers_;
+  base::ObserverList<Observer> observers_;
 
   Source* source_;  // Owned by ImageSkia storage.
   gfx::ImageSkia image_skia_;
diff --git a/extensions/browser/extension_pref_value_map.h b/extensions/browser/extension_pref_value_map.h
index a21661c..5161896 100644
--- a/extensions/browser/extension_pref_value_map.h
+++ b/extensions/browser/extension_pref_value_map.h
@@ -197,7 +197,7 @@ class ExtensionPrefValueMap : public KeyedService {
   // be done in the destructor. This bit tracks whether it has been done yet.
   bool destroyed_;
 
-  ObserverList<Observer, true> observers_;
+  base::ObserverList<Observer, true> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(ExtensionPrefValueMap);
 };
diff --git a/extensions/browser/extension_prefs.h b/extensions/browser/extension_prefs.h
index 88ff025..9cd810e 100644
--- a/extensions/browser/extension_prefs.h
+++ b/extensions/browser/extension_prefs.h
@@ -688,7 +688,7 @@ class ExtensionPrefs : public ExtensionScopedPrefs, public KeyedService {
 
   bool extensions_disabled_;
 
-  ObserverList<ExtensionPrefsObserver> observer_list_;
+  base::ObserverList<ExtensionPrefsObserver> observer_list_;
 
   DISALLOW_COPY_AND_ASSIGN(ExtensionPrefs);
 };
diff --git a/extensions/browser/extension_registry.h b/extensions/browser/extension_registry.h
index d29a37b..fa5b493 100644
--- a/extensions/browser/extension_registry.h
+++ b/extensions/browser/extension_registry.h
@@ -183,7 +183,7 @@ class ExtensionRegistry : public KeyedService {
   // Extensions that are installed and blocked. Will never be loaded.
   ExtensionSet blocked_extensions_;
 
-  ObserverList<ExtensionRegistryObserver> observers_;
+  base::ObserverList<ExtensionRegistryObserver> observers_;
 
   content::BrowserContext* const browser_context_;
 
diff --git a/extensions/browser/guest_view/web_view/web_view_guest.h b/extensions/browser/guest_view/web_view/web_view_guest.h
index fcfd800..517c1db 100644
--- a/extensions/browser/guest_view/web_view/web_view_guest.h
+++ b/extensions/browser/guest_view/web_view/web_view_guest.h
@@ -353,7 +353,7 @@ class WebViewGuest : public guest_view::GuestView<WebViewGuest>,
   // Handles find requests and replies for the webview find API.
   WebViewFindHelper find_helper_;
 
-  ObserverList<ScriptExecutionObserver> script_observers_;
+  base::ObserverList<ScriptExecutionObserver> script_observers_;
   scoped_ptr<ScriptExecutor> script_executor_;
 
   content::NotificationRegistrar notification_registrar_;
diff --git a/extensions/browser/process_manager.h b/extensions/browser/process_manager.h
index 4e7c475..85f2def 100644
--- a/extensions/browser/process_manager.h
+++ b/extensions/browser/process_manager.h
@@ -297,7 +297,7 @@ class ProcessManager : public KeyedService,
   ImpulseCallbackForTesting keepalive_impulse_callback_for_testing_;
   ImpulseCallbackForTesting keepalive_impulse_decrement_callback_for_testing_;
 
-  ObserverList<ProcessManagerObserver> observer_list_;
+  base::ObserverList<ProcessManagerObserver> observer_list_;
 
   // ID Counter used to set ProcessManager::BackgroundPageData close_sequence_id
   // members. These IDs are tracked per extension in background_page_data_ and
diff --git a/extensions/browser/script_executor.cc b/extensions/browser/script_executor.cc
index 6161f3c..db5de75 100644
--- a/extensions/browser/script_executor.cc
+++ b/extensions/browser/script_executor.cc
@@ -33,7 +33,7 @@ const char* kRendererDestroyed = "The tab was closed.";
 // corresponding response comes from the renderer, or the renderer is destroyed.
 class Handler : public content::WebContentsObserver {
  public:
-  Handler(ObserverList<ScriptExecutionObserver>* script_observers,
+  Handler(base::ObserverList<ScriptExecutionObserver>* script_observers,
           content::WebContents* web_contents,
           ExtensionMsg_ExecuteCode_Params* params,
           ScriptExecutor::FrameScope scope,
@@ -147,7 +147,7 @@ class Handler : public content::WebContentsObserver {
     delete this;
   }
 
-  base::WeakPtr<ObserverList<ScriptExecutionObserver>> script_observers_;
+  base::WeakPtr<base::ObserverList<ScriptExecutionObserver>> script_observers_;
 
   // The id of the host (the extension or the webui) doing the injection.
   HostID host_id_;
@@ -185,7 +185,7 @@ ScriptExecutionObserver::~ScriptExecutionObserver() {
 
 ScriptExecutor::ScriptExecutor(
     content::WebContents* web_contents,
-    ObserverList<ScriptExecutionObserver>* script_observers)
+    base::ObserverList<ScriptExecutionObserver>* script_observers)
     : next_request_id_(0),
       web_contents_(web_contents),
       script_observers_(script_observers) {
diff --git a/extensions/browser/script_executor.h b/extensions/browser/script_executor.h
index 322e9bb..4f81b78 100644
--- a/extensions/browser/script_executor.h
+++ b/extensions/browser/script_executor.h
@@ -32,7 +32,7 @@ class ScriptExecutor {
       content::WebContents* web_contents,
       // |script_observers| is assumed to be owned by |this|'s owner, and in
       // such a way that |this| is destroyed first.
-      ObserverList<ScriptExecutionObserver>* script_observers);
+      base::ObserverList<ScriptExecutionObserver>* script_observers);
 
   ~ScriptExecutor();
 
@@ -105,7 +105,7 @@ class ScriptExecutor {
 
   content::WebContents* web_contents_;
 
-  ObserverList<ScriptExecutionObserver>* script_observers_;
+  base::ObserverList<ScriptExecutionObserver>* script_observers_;
 };
 
 }  // namespace extensions
diff --git a/extensions/browser/user_script_loader.h b/extensions/browser/user_script_loader.h
index c1f10ac..67ef745 100644
--- a/extensions/browser/user_script_loader.h
+++ b/extensions/browser/user_script_loader.h
@@ -175,7 +175,7 @@ class UserScriptLoader : public content::NotificationObserver {
   HostID host_id_;
 
   // The associated observers.
-  ObserverList<Observer> observers_;
+  base::ObserverList<Observer> observers_;
 
   base::WeakPtrFactory<UserScriptLoader> weak_factory_;
 
diff --git a/extensions/browser/warning_service.h b/extensions/browser/warning_service.h
index 655c445..1d6d89f 100644
--- a/extensions/browser/warning_service.h
+++ b/extensions/browser/warning_service.h
@@ -92,7 +92,7 @@ class WarningService : public KeyedService,
   ScopedObserver<ExtensionRegistry, ExtensionRegistryObserver>
       extension_registry_observer_;
 
-  ObserverList<Observer> observer_list_;
+  base::ObserverList<Observer> observer_list_;
 };
 
 }  // namespace extensions
diff --git a/extensions/components/native_app_window/native_app_window_views.h b/extensions/components/native_app_window/native_app_window_views.h
index a108c67..c6bac37 100644
--- a/extensions/components/native_app_window/native_app_window_views.h
+++ b/extensions/components/native_app_window/native_app_window_views.h
@@ -181,7 +181,7 @@ class NativeAppWindowViews : public extensions::NativeAppWindow,
 
   views::UnhandledKeyboardEventHandler unhandled_keyboard_event_handler_;
 
-  ObserverList<web_modal::ModalDialogHostObserver> observer_list_;
+  base::ObserverList<web_modal::ModalDialogHostObserver> observer_list_;
 
   DISALLOW_COPY_AND_ASSIGN(NativeAppWindowViews);
 };
diff --git a/extensions/renderer/user_script_set.h b/extensions/renderer/user_script_set.h
index 5ce5152..97afaaa 100644
--- a/extensions/renderer/user_script_set.h
+++ b/extensions/renderer/user_script_set.h
@@ -94,7 +94,7 @@ class UserScriptSet {
   ScopedVector<UserScript> scripts_;
 
   // The associated observers.
-  ObserverList<Observer> observers_;
+  base::ObserverList<Observer> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(UserScriptSet);
 };
diff --git a/extensions/renderer/user_script_set_manager.h b/extensions/renderer/user_script_set_manager.h
index 02d22ef..e2d645f 100644
--- a/extensions/renderer/user_script_set_manager.h
+++ b/extensions/renderer/user_script_set_manager.h
@@ -105,7 +105,7 @@ class UserScriptSetManager : public content::RenderProcessObserver {
   const ExtensionSet* extensions_;
 
   // The associated observers.
-  ObserverList<Observer> observers_;
+  base::ObserverList<Observer> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(UserScriptSetManager);
 };
diff --git a/gin/modules/module_registry.h b/gin/modules/module_registry.h
index b67387b..a2e0d0b 100644
--- a/gin/modules/module_registry.h
+++ b/gin/modules/module_registry.h
@@ -99,7 +99,7 @@ class GIN_EXPORT ModuleRegistry {
   PendingModuleVector pending_modules_;
   v8::Persistent<v8::Object> modules_;
 
-  ObserverList<ModuleRegistryObserver> observer_list_;
+  base::ObserverList<ModuleRegistryObserver> observer_list_;
 
   DISALLOW_COPY_AND_ASSIGN(ModuleRegistry);
 };
diff --git a/google_apis/drive/auth_service.h b/google_apis/drive/auth_service.h
index 50f3b9f..9ce6abc 100644
--- a/google_apis/drive/auth_service.h
+++ b/google_apis/drive/auth_service.h
@@ -69,7 +69,7 @@ class AuthService : public AuthServiceInterface,
   bool has_refresh_token_;
   std::string access_token_;
   std::vector<std::string> scopes_;
-  ObserverList<AuthServiceObserver> observers_;
+  base::ObserverList<AuthServiceObserver> observers_;
   base::ThreadChecker thread_checker_;
 
   // Note: This should remain the last member so it'll be destroyed and
diff --git a/google_apis/gaia/account_tracker.h b/google_apis/gaia/account_tracker.h
index 41ebd2e..61d3748 100644
--- a/google_apis/gaia/account_tracker.h
+++ b/google_apis/gaia/account_tracker.h
@@ -109,7 +109,7 @@ class AccountTracker : public OAuth2TokenService::Observer,
   scoped_refptr<net::URLRequestContextGetter> request_context_getter_;
   std::map<std::string, AccountIdFetcher*> user_info_requests_;
   std::map<std::string, AccountState> accounts_;
-  ObserverList<Observer> observer_list_;
+  base::ObserverList<Observer> observer_list_;
   bool shutdown_called_;
 };
 
diff --git a/google_apis/gaia/identity_provider.h b/google_apis/gaia/identity_provider.h
index 6ee9b8c..7c7e0d1 100644
--- a/google_apis/gaia/identity_provider.h
+++ b/google_apis/gaia/identity_provider.h
@@ -83,8 +83,9 @@ class IdentityProvider : public OAuth2TokenService::Observer {
   void FireOnActiveAccountLogout();
 
  private:
-  ObserverList<Observer, true> observers_;
-  ObserverList<OAuth2TokenService::Observer, true> token_service_observers_;
+  base::ObserverList<Observer, true> observers_;
+  base::ObserverList<OAuth2TokenService::Observer, true>
+      token_service_observers_;
   int token_service_observer_count_;
 
   DISALLOW_COPY_AND_ASSIGN(IdentityProvider);
diff --git a/google_apis/gaia/oauth2_token_service.h b/google_apis/gaia/oauth2_token_service.h
index 2306c10..4decbf4 100644
--- a/google_apis/gaia/oauth2_token_service.h
+++ b/google_apis/gaia/oauth2_token_service.h
@@ -385,10 +385,10 @@ class OAuth2TokenService : public base::NonThreadSafe {
 
   // List of observers to notify when refresh token availability changes.
   // Makes sure list is empty on destruction.
-  ObserverList<Observer, true> observer_list_;
+  base::ObserverList<Observer, true> observer_list_;
 
   // List of observers to notify when access token status changes.
-  ObserverList<DiagnosticsObserver, true> diagnostics_observer_list_;
+  base::ObserverList<DiagnosticsObserver, true> diagnostics_observer_list_;
 
   // The depth of batch changes.
   int batch_change_depth_;
diff --git a/gpu/command_buffer/service/shader_translator.h b/gpu/command_buffer/service/shader_translator.h
index ac431e3..858014d 100644
--- a/gpu/command_buffer/service/shader_translator.h
+++ b/gpu/command_buffer/service/shader_translator.h
@@ -118,7 +118,7 @@ class GPU_EXPORT ShaderTranslator
   ShHandle compiler_;
   bool implementation_is_glsl_es_;
   ShCompileOptions driver_bug_workarounds_;
-  ObserverList<DestructionObserver> destruction_observers_;
+  base::ObserverList<DestructionObserver> destruction_observers_;
 };
 
 }  // namespace gles2
diff --git a/gpu/command_buffer/service/valuebuffer_manager.h b/gpu/command_buffer/service/valuebuffer_manager.h
index d67616a..774b3a3 100644
--- a/gpu/command_buffer/service/valuebuffer_manager.h
+++ b/gpu/command_buffer/service/valuebuffer_manager.h
@@ -52,7 +52,7 @@ class GPU_EXPORT SubscriptionRefSet
 
   RefSet reference_set_;
 
-  ObserverList<Observer, true> observers_;
+  base::ObserverList<Observer, true> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(SubscriptionRefSet);
 };
diff --git a/ios/net/cookies/cookie_store_ios.mm b/ios/net/cookies/cookie_store_ios.mm
index 4ccf8b7..bd07150 100644
--- a/ios/net/cookies/cookie_store_ios.mm
+++ b/ios/net/cookies/cookie_store_ios.mm
@@ -60,7 +60,7 @@ class NotificationTrampoline {
   NotificationTrampoline();
   ~NotificationTrampoline();
 
-  ObserverList<CookieNotificationObserver> observer_list_;
+  base::ObserverList<CookieNotificationObserver> observer_list_;
 
   DISALLOW_COPY_AND_ASSIGN(NotificationTrampoline);
 
diff --git a/ios/web/active_state_manager_impl.h b/ios/web/active_state_manager_impl.h
index 05efd40..564f55b 100644
--- a/ios/web/active_state_manager_impl.h
+++ b/ios/web/active_state_manager_impl.h
@@ -48,7 +48,7 @@ class ActiveStateManagerImpl : public ActiveStateManager,
   // true if the ActiveStateManager is active.
   bool active_;
   // The list of observers.
-  ObserverList<Observer> observer_list_;
+  base::ObserverList<Observer> observer_list_;
 
   DISALLOW_COPY_AND_ASSIGN(ActiveStateManagerImpl);
 };
diff --git a/ios/web/web_state/web_state_impl.h b/ios/web/web_state/web_state_impl.h
index 067f96a..ba236ce 100644
--- a/ios/web/web_state/web_state_impl.h
+++ b/ios/web/web_state/web_state_impl.h
@@ -283,7 +283,7 @@ class WebStateImpl : public WebState, public NavigationManagerDelegate {
   scoped_ptr<web::WebUIIOS> web_ui_;
 
   // A list of observers notified when page state changes. Weak references.
-  ObserverList<WebStateObserver, true> observers_;
+  base::ObserverList<WebStateObserver, true> observers_;
 
   // Map of all the HTTP response headers received, for each URL.
   // This map is cleared after each page load, and only the headers of the main
diff --git a/ipc/ipc_test_sink.h b/ipc/ipc_test_sink.h
index 0781db0..a802686 100644
--- a/ipc/ipc_test_sink.h
+++ b/ipc/ipc_test_sink.h
@@ -128,7 +128,7 @@ class TestSink : public Channel {
  private:
   // The actual list of received messages.
   std::vector<Message> messages_;
-  ObserverList<Listener> filter_list_;
+  base::ObserverList<Listener> filter_list_;
 
   DISALLOW_COPY_AND_ASSIGN(TestSink);
 };
diff --git a/jingle/notifier/listener/fake_push_client.h b/jingle/notifier/listener/fake_push_client.h
index 3c12f51..466081d9 100644
--- a/jingle/notifier/listener/fake_push_client.h
+++ b/jingle/notifier/listener/fake_push_client.h
@@ -46,7 +46,7 @@ class FakePushClient : public PushClient {
   int sent_pings() const;
 
  private:
-  ObserverList<PushClientObserver> observers_;
+  base::ObserverList<PushClientObserver> observers_;
   SubscriptionList subscriptions_;
   std::string email_;
   std::string token_;
diff --git a/jingle/notifier/listener/non_blocking_push_client.h b/jingle/notifier/listener/non_blocking_push_client.h
index 27e07fb..f91c971 100644
--- a/jingle/notifier/listener/non_blocking_push_client.h
+++ b/jingle/notifier/listener/non_blocking_push_client.h
@@ -62,7 +62,7 @@ class NonBlockingPushClient : public PushClient {
   const scoped_refptr<base::SingleThreadTaskRunner> delegate_task_runner_;
   scoped_refptr<Core> core_;
 
-  ObserverList<PushClientObserver> observers_;
+  base::ObserverList<PushClientObserver> observers_;
 
   base::WeakPtrFactory<NonBlockingPushClient> weak_ptr_factory_;
 
diff --git a/jingle/notifier/listener/xmpp_push_client.h b/jingle/notifier/listener/xmpp_push_client.h
index ea63eb7..a37f496 100644
--- a/jingle/notifier/listener/xmpp_push_client.h
+++ b/jingle/notifier/listener/xmpp_push_client.h
@@ -71,7 +71,7 @@ class XmppPushClient :
  private:
   base::ThreadChecker thread_checker_;
   const NotifierOptions notifier_options_;
-  ObserverList<PushClientObserver> observers_;
+  base::ObserverList<PushClientObserver> observers_;
 
   // XMPP connection settings.
   SubscriptionList subscriptions_;
diff --git a/media/audio/audio_manager_base.cc b/media/audio/audio_manager_base.cc
index fe7c12e..b633432 100644
--- a/media/audio/audio_manager_base.cc
+++ b/media/audio/audio_manager_base.cc
@@ -78,10 +78,11 @@ AudioManagerBase::AudioManagerBase(AudioLogFactory* audio_log_factory)
       max_num_input_streams_(kDefaultMaxInputStreams),
       num_output_streams_(0),
       num_input_streams_(0),
-      // TODO(dalecurtis): Switch this to an ObserverListThreadSafe, so we don't
+      // TODO(dalecurtis): Switch this to an base::ObserverListThreadSafe, so we
+      // don't
       // block the UI thread when swapping devices.
       output_listeners_(
-          ObserverList<AudioDeviceListener>::NOTIFY_EXISTING_ONLY),
+          base::ObserverList<AudioDeviceListener>::NOTIFY_EXISTING_ONLY),
       audio_thread_("AudioThread"),
       audio_log_factory_(audio_log_factory) {
 #if defined(OS_WIN)
diff --git a/media/audio/audio_manager_base.h b/media/audio/audio_manager_base.h
index 113a0202..0ac7020 100644
--- a/media/audio/audio_manager_base.h
+++ b/media/audio/audio_manager_base.h
@@ -174,7 +174,7 @@ class MEDIA_EXPORT AudioManagerBase : public AudioManager {
   int num_input_streams_;
 
   // Track output state change listeners.
-  ObserverList<AudioDeviceListener> output_listeners_;
+  base::ObserverList<AudioDeviceListener> output_listeners_;
 
   // Thread used to interact with audio streams created by this audio manager.
   base::Thread audio_thread_;
diff --git a/media/base/user_input_monitor.h b/media/base/user_input_monitor.h
index ab572694..8016a00 100644
--- a/media/base/user_input_monitor.h
+++ b/media/base/user_input_monitor.h
@@ -33,7 +33,7 @@ class MEDIA_EXPORT UserInputMonitor {
    protected:
     virtual ~MouseEventListener() {}
   };
-  typedef ObserverListThreadSafe<UserInputMonitor::MouseEventListener>
+  typedef base::ObserverListThreadSafe<UserInputMonitor::MouseEventListener>
       MouseListenerList;
 
   UserInputMonitor();
diff --git a/media/base/user_input_monitor_linux.cc b/media/base/user_input_monitor_linux.cc
index 55675ec..2be9b18 100644
--- a/media/base/user_input_monitor_linux.cc
+++ b/media/base/user_input_monitor_linux.cc
@@ -68,8 +68,8 @@ class UserInputMonitorLinuxCore
   static void ProcessReply(XPointer self, XRecordInterceptData* data);
 
   scoped_refptr<base::SingleThreadTaskRunner> io_task_runner_;
-  scoped_refptr<ObserverListThreadSafe<UserInputMonitor::MouseEventListener> >
-      mouse_listeners_;
+  scoped_refptr<base::ObserverListThreadSafe<
+      UserInputMonitor::MouseEventListener>> mouse_listeners_;
 
   //
   // The following members should only be accessed on the IO thread.
diff --git a/media/base/user_input_monitor_win.cc b/media/base/user_input_monitor_win.cc
index 6210236..3e172c4 100644
--- a/media/base/user_input_monitor_win.cc
+++ b/media/base/user_input_monitor_win.cc
@@ -60,8 +60,8 @@ class UserInputMonitorWinCore
 
   // Task runner on which |window_| is created.
   scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner_;
-  scoped_refptr<ObserverListThreadSafe<UserInputMonitor::MouseEventListener> >
-      mouse_listeners_;
+  scoped_refptr<base::ObserverListThreadSafe<
+      UserInputMonitor::MouseEventListener>> mouse_listeners_;
 
   // These members are only accessed on the UI thread.
   scoped_ptr<base::win::MessageWindow> window_;
diff --git a/mojo/common/message_pump_mojo.h b/mojo/common/message_pump_mojo.h
index 899f979..86dd8ac 100644
--- a/mojo/common/message_pump_mojo.h
+++ b/mojo/common/message_pump_mojo.h
@@ -125,7 +125,7 @@ class MOJO_COMMON_EXPORT MessagePumpMojo : public base::MessagePump {
   // notify it.
   int next_handler_id_;
 
-  ObserverList<Observer> observers_;
+  base::ObserverList<Observer> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(MessagePumpMojo);
 };
diff --git a/net/android/network_change_notifier_android_unittest.cc b/net/android/network_change_notifier_android_unittest.cc
index 30ee4f0..8c63d81 100644
--- a/net/android/network_change_notifier_android_unittest.cc
+++ b/net/android/network_change_notifier_android_unittest.cc
@@ -123,7 +123,8 @@ class BaseNetworkChangeNotifierAndroidTest : public testing::Test {
 
   void SetOnline() {
     delegate_.SetOnline();
-    // Note that this is needed because ObserverListThreadSafe uses PostTask().
+    // Note that this is needed because base::ObserverListThreadSafe uses
+    // PostTask().
     base::MessageLoop::current()->RunUntilIdle();
   }
 
diff --git a/net/android/network_change_notifier_delegate_android.cc b/net/android/network_change_notifier_delegate_android.cc
index f623b14..856acfe 100644
--- a/net/android/network_change_notifier_delegate_android.cc
+++ b/net/android/network_change_notifier_delegate_android.cc
@@ -52,7 +52,7 @@ jdouble GetMaxBandwidthForConnectionSubtype(JNIEnv* env,
 }
 
 NetworkChangeNotifierDelegateAndroid::NetworkChangeNotifierDelegateAndroid()
-    : observers_(new ObserverListThreadSafe<Observer>()) {
+    : observers_(new base::ObserverListThreadSafe<Observer>()) {
   JNIEnv* env = base::android::AttachCurrentThread();
   java_network_change_notifier_.Reset(
       Java_NetworkChangeNotifier_init(
diff --git a/net/android/network_change_notifier_delegate_android.h b/net/android/network_change_notifier_delegate_android.h
index 6668b27..cf8390f 100644
--- a/net/android/network_change_notifier_delegate_android.h
+++ b/net/android/network_change_notifier_delegate_android.h
@@ -83,7 +83,7 @@ class NET_EXPORT_PRIVATE NetworkChangeNotifierDelegateAndroid {
   void SetOffline();
 
   base::ThreadChecker thread_checker_;
-  scoped_refptr<ObserverListThreadSafe<Observer> > observers_;
+  scoped_refptr<base::ObserverListThreadSafe<Observer>> observers_;
   scoped_refptr<base::SingleThreadTaskRunner> jni_task_runner_;
   base::android::ScopedJavaGlobalRef<jobject> java_network_change_notifier_;
   mutable base::Lock connection_lock_;  // Protects the state below.
diff --git a/net/base/network_change_notifier.cc b/net/base/network_change_notifier.cc
index 0a4a1f1..7c49fdd 100644
--- a/net/base/network_change_notifier.cc
+++ b/net/base/network_change_notifier.cc
@@ -796,18 +796,20 @@ void NetworkChangeNotifier::SetTestNotificationsOnly(bool test_only) {
 NetworkChangeNotifier::NetworkChangeNotifier(
     const NetworkChangeCalculatorParams& params
     /*= NetworkChangeCalculatorParams()*/)
-    : ip_address_observer_list_(new ObserverListThreadSafe<IPAddressObserver>(
-          base::ObserverListBase<IPAddressObserver>::NOTIFY_EXISTING_ONLY)),
+    : ip_address_observer_list_(
+          new base::ObserverListThreadSafe<IPAddressObserver>(
+              base::ObserverListBase<IPAddressObserver>::NOTIFY_EXISTING_ONLY)),
       connection_type_observer_list_(
-          new ObserverListThreadSafe<ConnectionTypeObserver>(
+          new base::ObserverListThreadSafe<ConnectionTypeObserver>(
               base::ObserverListBase<
                   ConnectionTypeObserver>::NOTIFY_EXISTING_ONLY)),
-      resolver_state_observer_list_(new ObserverListThreadSafe<DNSObserver>(
-          base::ObserverListBase<DNSObserver>::NOTIFY_EXISTING_ONLY)),
-      network_change_observer_list_(new ObserverListThreadSafe<
+      resolver_state_observer_list_(
+          new base::ObserverListThreadSafe<DNSObserver>(
+              base::ObserverListBase<DNSObserver>::NOTIFY_EXISTING_ONLY)),
+      network_change_observer_list_(new base::ObserverListThreadSafe<
           NetworkChangeObserver>(
           base::ObserverListBase<NetworkChangeObserver>::NOTIFY_EXISTING_ONLY)),
-      max_bandwidth_observer_list_(new ObserverListThreadSafe<
+      max_bandwidth_observer_list_(new base::ObserverListThreadSafe<
           MaxBandwidthObserver>(
           base::ObserverListBase<MaxBandwidthObserver>::NOTIFY_EXISTING_ONLY)),
       network_state_(new NetworkState()),
diff --git a/net/base/network_change_notifier.h b/net/base/network_change_notifier.h
index b2e54f5..df6792f 100644
--- a/net/base/network_change_notifier.h
+++ b/net/base/network_change_notifier.h
@@ -430,15 +430,15 @@ class NET_EXPORT NetworkChangeNotifier {
   void NotifyObserversOfNetworkChangeImpl(ConnectionType type);
   void NotifyObserversOfMaxBandwidthChangeImpl(double max_bandwidth_mbps);
 
-  const scoped_refptr<ObserverListThreadSafe<IPAddressObserver>>
+  const scoped_refptr<base::ObserverListThreadSafe<IPAddressObserver>>
       ip_address_observer_list_;
-  const scoped_refptr<ObserverListThreadSafe<ConnectionTypeObserver>>
+  const scoped_refptr<base::ObserverListThreadSafe<ConnectionTypeObserver>>
       connection_type_observer_list_;
-  const scoped_refptr<ObserverListThreadSafe<DNSObserver>>
+  const scoped_refptr<base::ObserverListThreadSafe<DNSObserver>>
       resolver_state_observer_list_;
-  const scoped_refptr<ObserverListThreadSafe<NetworkChangeObserver>>
+  const scoped_refptr<base::ObserverListThreadSafe<NetworkChangeObserver>>
       network_change_observer_list_;
-  const scoped_refptr<ObserverListThreadSafe<MaxBandwidthObserver>>
+  const scoped_refptr<base::ObserverListThreadSafe<MaxBandwidthObserver>>
       max_bandwidth_observer_list_;
 
   // The current network state. Hosts DnsConfig, exposed via GetDnsConfig.
diff --git a/net/base/sdch_manager.h b/net/base/sdch_manager.h
index 72aca28..366b81f 100644
--- a/net/base/sdch_manager.h
+++ b/net/base/sdch_manager.h
@@ -248,7 +248,7 @@ class NET_EXPORT SdchManager {
   // Assert list is empty on destruction since if there is an observer
   // that hasn't removed itself from the list, that observer probably
   // has a reference to the SdchManager.
-  ObserverList<SdchObserver, true> observers_;
+  base::ObserverList<SdchObserver, true> observers_;
 
   base::ThreadChecker thread_checker_;
 
diff --git a/net/cert/cert_database.h b/net/cert/cert_database.h
index fb28c89..43e715e 100644
--- a/net/cert/cert_database.h
+++ b/net/cert/cert_database.h
@@ -14,7 +14,8 @@
 template <typename T> struct DefaultSingletonTraits;
 
 namespace base {
-template <class ObserverType> class ObserverListThreadSafe;
+template <class ObserverType>
+class ObserverListThreadSafe;
 }
 
 namespace net {
diff --git a/net/cert/cert_database_android.cc b/net/cert/cert_database_android.cc
index 144b9a1..d9b0dfc 100644
--- a/net/cert/cert_database_android.cc
+++ b/net/cert/cert_database_android.cc
@@ -12,7 +12,7 @@
 namespace net {
 
 CertDatabase::CertDatabase()
-    : observer_list_(new ObserverListThreadSafe<Observer>) {
+    : observer_list_(new base::ObserverListThreadSafe<Observer>) {
 }
 
 CertDatabase::~CertDatabase() {}
diff --git a/net/cert/cert_database_ios.cc b/net/cert/cert_database_ios.cc
index f96f22a..87dfd39 100644
--- a/net/cert/cert_database_ios.cc
+++ b/net/cert/cert_database_ios.cc
@@ -11,7 +11,8 @@
 namespace net {
 
 CertDatabase::CertDatabase()
-    : observer_list_(new ObserverListThreadSafe<Observer>) {}
+    : observer_list_(new base::ObserverListThreadSafe<Observer>) {
+}
 
 CertDatabase::~CertDatabase() {}
 
diff --git a/net/cert/cert_database_mac.cc b/net/cert/cert_database_mac.cc
index 3f405f3..c6aad551 100644
--- a/net/cert/cert_database_mac.cc
+++ b/net/cert/cert_database_mac.cc
@@ -119,7 +119,7 @@ void CertDatabase::SetMessageLoopForKeychainEvents() {
 }
 
 CertDatabase::CertDatabase()
-    : observer_list_(new ObserverListThreadSafe<Observer>) {
+    : observer_list_(new base::ObserverListThreadSafe<Observer>) {
 }
 
 CertDatabase::~CertDatabase() {
diff --git a/net/cert/cert_database_nss.cc b/net/cert/cert_database_nss.cc
index 6d66cc1..49d27f2 100644
--- a/net/cert/cert_database_nss.cc
+++ b/net/cert/cert_database_nss.cc
@@ -19,7 +19,7 @@
 namespace net {
 
 CertDatabase::CertDatabase()
-    : observer_list_(new ObserverListThreadSafe<Observer>) {
+    : observer_list_(new base::ObserverListThreadSafe<Observer>) {
   crypto::EnsureNSSInit();
 }
 
diff --git a/net/cert/cert_database_openssl.cc b/net/cert/cert_database_openssl.cc
index a67ac1b..a59c2eb 100644
--- a/net/cert/cert_database_openssl.cc
+++ b/net/cert/cert_database_openssl.cc
@@ -17,7 +17,7 @@
 namespace net {
 
 CertDatabase::CertDatabase()
-    : observer_list_(new ObserverListThreadSafe<Observer>) {
+    : observer_list_(new base::ObserverListThreadSafe<Observer>) {
 }
 
 CertDatabase::~CertDatabase() {}
diff --git a/net/cert/cert_database_win.cc b/net/cert/cert_database_win.cc
index fae3cbf..ef8147b 100644
--- a/net/cert/cert_database_win.cc
+++ b/net/cert/cert_database_win.cc
@@ -16,7 +16,7 @@
 namespace net {
 
 CertDatabase::CertDatabase()
-    : observer_list_(new ObserverListThreadSafe<Observer>) {
+    : observer_list_(new base::ObserverListThreadSafe<Observer>) {
 }
 
 CertDatabase::~CertDatabase() {}
diff --git a/net/cert/nss_cert_database.cc b/net/cert/nss_cert_database.cc
index 8aaf759..c9f0133 100644
--- a/net/cert/nss_cert_database.cc
+++ b/net/cert/nss_cert_database.cc
@@ -82,7 +82,7 @@ NSSCertDatabase::NSSCertDatabase(crypto::ScopedPK11Slot public_slot,
                                  crypto::ScopedPK11Slot private_slot)
     : public_slot_(public_slot.Pass()),
       private_slot_(private_slot.Pass()),
-      observer_list_(new ObserverListThreadSafe<Observer>),
+      observer_list_(new base::ObserverListThreadSafe<Observer>),
       weak_factory_(this) {
   CHECK(public_slot_);
 
diff --git a/net/dns/mdns_client_impl.cc b/net/dns/mdns_client_impl.cc
index b4cae7c..2fe89b1 100644
--- a/net/dns/mdns_client_impl.cc
+++ b/net/dns/mdns_client_impl.cc
@@ -341,14 +341,15 @@ void MDnsClientImpl::Core::AddListener(
     MDnsListenerImpl* listener) {
   ListenerKey key(listener->GetName(), listener->GetType());
   std::pair<ListenerMap::iterator, bool> observer_insert_result =
-      listeners_.insert(
-          make_pair(key, static_cast<ObserverList<MDnsListenerImpl>*>(NULL)));
+      listeners_.insert(make_pair(
+          key, static_cast<base::ObserverList<MDnsListenerImpl>*>(NULL)));
 
   // If an equivalent key does not exist, actually create the observer list.
   if (observer_insert_result.second)
-    observer_insert_result.first->second = new ObserverList<MDnsListenerImpl>();
+    observer_insert_result.first->second =
+        new base::ObserverList<MDnsListenerImpl>();
 
-  ObserverList<MDnsListenerImpl>* observer_list =
+  base::ObserverList<MDnsListenerImpl>* observer_list =
       observer_insert_result.first->second;
 
   observer_list->AddObserver(listener);
diff --git a/net/dns/mdns_client_impl.h b/net/dns/mdns_client_impl.h
index a0c5b98..e788601 100644
--- a/net/dns/mdns_client_impl.h
+++ b/net/dns/mdns_client_impl.h
@@ -141,8 +141,8 @@ class NET_EXPORT_PRIVATE MDnsClientImpl : public MDnsClient {
     FRIEND_TEST_ALL_PREFIXES(MDnsTest, CacheCleanupWithShortTTL);
 
     typedef std::pair<std::string, uint16> ListenerKey;
-    typedef std::map<ListenerKey, ObserverList<MDnsListenerImpl>* >
-    ListenerMap;
+    typedef std::map<ListenerKey, base::ObserverList<MDnsListenerImpl>*>
+        ListenerMap;
 
     // Alert listeners of an update to the cache.
     void AlertListeners(MDnsCache::UpdateType update_type,
diff --git a/net/log/net_log.h b/net/log/net_log.h
index 6463c77..7104022 100644
--- a/net/log/net_log.h
+++ b/net/log/net_log.h
@@ -312,7 +312,7 @@ class NET_EXPORT NetLog {
   base::subtle::Atomic32 is_capturing_;
 
   // |lock_| must be acquired whenever reading or writing to this.
-  ObserverList<ThreadSafeObserver, true> observers_;
+  base::ObserverList<ThreadSafeObserver, true> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(NetLog);
 };
diff --git a/net/proxy/polling_proxy_config_service.cc b/net/proxy/polling_proxy_config_service.cc
index 089ef39..4044e1b 100644
--- a/net/proxy/polling_proxy_config_service.cc
+++ b/net/proxy/polling_proxy_config_service.cc
@@ -145,7 +145,7 @@ class PollingProxyConfigService::Core
   }
 
   GetConfigFunction get_config_func_;
-  ObserverList<Observer> observers_;
+  base::ObserverList<Observer> observers_;
   ProxyConfig last_config_;
   base::TimeTicks last_poll_time_;
   base::TimeDelta poll_interval_;
diff --git a/net/proxy/proxy_config_service_android.cc b/net/proxy/proxy_config_service_android.cc
index c3b34d9..66065fb 100644
--- a/net/proxy/proxy_config_service_android.cc
+++ b/net/proxy/proxy_config_service_android.cc
@@ -355,7 +355,7 @@ class ProxyConfigServiceAndroid::Delegate
   ScopedJavaGlobalRef<jobject> java_proxy_change_listener_;
 
   JNIDelegateImpl jni_delegate_;
-  ObserverList<Observer> observers_;
+  base::ObserverList<Observer> observers_;
   scoped_refptr<base::SequencedTaskRunner> network_task_runner_;
   scoped_refptr<base::SequencedTaskRunner> jni_task_runner_;
   GetPropertyCallback get_property_callback_;
diff --git a/net/proxy/proxy_config_service_linux.h b/net/proxy/proxy_config_service_linux.h
index 3d05898..311f81f 100644
--- a/net/proxy/proxy_config_service_linux.h
+++ b/net/proxy/proxy_config_service_linux.h
@@ -266,7 +266,7 @@ class NET_EXPORT_PRIVATE ProxyConfigServiceLinux : public ProxyConfigService {
     // the thread running this loop.
     scoped_refptr<base::SingleThreadTaskRunner> io_task_runner_;
 
-    ObserverList<Observer> observers_;
+    base::ObserverList<Observer> observers_;
 
     DISALLOW_COPY_AND_ASSIGN(Delegate);
   };
diff --git a/net/proxy/proxy_config_service_mac.h b/net/proxy/proxy_config_service_mac.h
index 87c8162..01a0e26 100644
--- a/net/proxy/proxy_config_service_mac.h
+++ b/net/proxy/proxy_config_service_mac.h
@@ -65,7 +65,7 @@ class ProxyConfigServiceMac : public ProxyConfigService {
   Forwarder forwarder_;
   scoped_ptr<const NetworkConfigWatcherMac> config_watcher_;
 
-  ObserverList<Observer> observers_;
+  base::ObserverList<Observer> observers_;
 
   // Holds the last system proxy settings that we fetched.
   bool has_fetched_config_;
diff --git a/net/proxy/proxy_service_unittest.cc b/net/proxy/proxy_service_unittest.cc
index 550365b..6d6c747 100644
--- a/net/proxy/proxy_service_unittest.cc
+++ b/net/proxy/proxy_service_unittest.cc
@@ -156,7 +156,7 @@ class MockProxyConfigService: public ProxyConfigService {
  private:
   ConfigAvailability availability_;
   ProxyConfig config_;
-  ObserverList<Observer, true> observers_;
+  base::ObserverList<Observer, true> observers_;
 };
 
 // A test network delegate that exercises the OnResolveProxy callback.
diff --git a/net/ssl/ssl_config_service.cc b/net/ssl/ssl_config_service.cc
index 5b57cc2..b3237a4 100644
--- a/net/ssl/ssl_config_service.cc
+++ b/net/ssl/ssl_config_service.cc
@@ -11,7 +11,7 @@
 namespace net {
 
 SSLConfigService::SSLConfigService()
-    : observer_list_(ObserverList<Observer>::NOTIFY_EXISTING_ONLY) {
+    : observer_list_(base::ObserverList<Observer>::NOTIFY_EXISTING_ONLY) {
 }
 
 // GlobalSSLObject holds a reference to a global SSL object, such as the
diff --git a/net/ssl/ssl_config_service.h b/net/ssl/ssl_config_service.h
index dd3236d..494614e 100644
--- a/net/ssl/ssl_config_service.h
+++ b/net/ssl/ssl_config_service.h
@@ -81,7 +81,7 @@ class NET_EXPORT SSLConfigService
                            const SSLConfig& new_config);
 
  private:
-  ObserverList<Observer> observer_list_;
+  base::ObserverList<Observer> observer_list_;
 };
 
 }  // namespace net
diff --git a/net/url_request/url_request_context_getter.h b/net/url_request/url_request_context_getter.h
index 52cd341..1616f7c 100644
--- a/net/url_request/url_request_context_getter.h
+++ b/net/url_request/url_request_context_getter.h
@@ -68,7 +68,7 @@ class NET_EXPORT URLRequestContextGetter
   // IO happens.
   void OnDestruct() const;
 
-  ObserverList<URLRequestContextGetterObserver> observer_list_;
+  base::ObserverList<URLRequestContextGetterObserver> observer_list_;
 
   DISALLOW_COPY_AND_ASSIGN(URLRequestContextGetter);
 };
diff --git a/ppapi/host/ppapi_host.h b/ppapi/host/ppapi_host.h
index d4361df..f2a3821 100644
--- a/ppapi/host/ppapi_host.h
+++ b/ppapi/host/ppapi_host.h
@@ -123,13 +123,13 @@ class PPAPI_HOST_EXPORT PpapiHost : public IPC::Sender, public IPC::Listener {
   // Filters for resource creation messages. Note that since we don't support
   // deleting these dynamically we don't need to worry about modifications
   // during iteration. If we add that capability, this should be replaced with
-  // an ObserverList.
+  // an base::ObserverList.
   ScopedVector<HostFactory> host_factory_filters_;
 
   // Filters for instance messages. Note that since we don't support deleting
   // these dynamically we don't need to worry about modifications during
   // iteration. If we add that capability, this should be replaced with an
-  // ObserverList.
+  // base::ObserverList.
   ScopedVector<InstanceMessageFilter> instance_message_filters_;
 
   typedef std::map<PP_Resource, linked_ptr<ResourceHost> > ResourceMap;
diff --git a/ppapi/proxy/host_dispatcher.h b/ppapi/proxy/host_dispatcher.h
index 89be7ed..8c8e948 100644
--- a/ppapi/proxy/host_dispatcher.h
+++ b/ppapi/proxy/host_dispatcher.h
@@ -142,7 +142,7 @@ class PPAPI_PROXY_EXPORT HostDispatcher : public Dispatcher {
   // ultimately call back into the plugin.
   bool allow_plugin_reentrancy_;
 
-  ObserverList<SyncMessageStatusObserver> sync_status_observer_list_;
+  base::ObserverList<SyncMessageStatusObserver> sync_status_observer_list_;
 
   std::vector<IPC::Listener*> filters_;
 
diff --git a/ppapi/proxy/ppapi_proxy_test.cc b/ppapi/proxy/ppapi_proxy_test.cc
index 2b0667c..825cf7c 100644
--- a/ppapi/proxy/ppapi_proxy_test.cc
+++ b/ppapi/proxy/ppapi_proxy_test.cc
@@ -62,10 +62,11 @@ PPB_Proxy_Private ppb_proxy_private = {
 // for the PluginProxyTestHarness and should only respond for PPP interfaces,
 // and the other handler is for the HostProxyTestHarness which should only
 // ever respond for PPB interfaces.
-ObserverList<ProxyTestHarnessBase> get_interface_handlers_;
+base::ObserverList<ProxyTestHarnessBase> get_interface_handlers_;
 
 const void* MockGetInterface(const char* name) {
-  ObserverList<ProxyTestHarnessBase>::Iterator it(&get_interface_handlers_);
+  base::ObserverList<ProxyTestHarnessBase>::Iterator it(
+      &get_interface_handlers_);
   while (ProxyTestHarnessBase* observer = it.GetNext()) {
     const void* interface = observer->GetInterface(name);
     if (interface)
diff --git a/remoting/client/plugin/delegating_signal_strategy.h b/remoting/client/plugin/delegating_signal_strategy.h
index 12fb595..94a3190 100644
--- a/remoting/client/plugin/delegating_signal_strategy.h
+++ b/remoting/client/plugin/delegating_signal_strategy.h
@@ -40,7 +40,7 @@ class DelegatingSignalStrategy : public SignalStrategy {
   std::string local_jid_;
   SendIqCallback send_iq_callback_;
 
-  ObserverList<Listener> listeners_;
+  base::ObserverList<Listener> listeners_;
 
   DISALLOW_COPY_AND_ASSIGN(DelegatingSignalStrategy);
 };
diff --git a/remoting/host/chromoting_host.h b/remoting/host/chromoting_host.h
index a6b1811..e06a9e1 100644
--- a/remoting/host/chromoting_host.h
+++ b/remoting/host/chromoting_host.h
@@ -185,7 +185,7 @@ class ChromotingHost : public base::NonThreadSafe,
   SignalStrategy* signal_strategy_;
 
   // Must be used on the network thread only.
-  ObserverList<HostStatusObserver> status_observers_;
+  base::ObserverList<HostStatusObserver> status_observers_;
 
   // The connections to remote clients.
   ClientList clients_;
diff --git a/remoting/host/daemon_process.h b/remoting/host/daemon_process.h
index 0a7b900..08bf0fd1 100644
--- a/remoting/host/daemon_process.h
+++ b/remoting/host/daemon_process.h
@@ -175,7 +175,7 @@ class DaemonProcess
   int next_terminal_id_;
 
   // Keeps track of observers receiving host status notifications.
-  ObserverList<HostStatusObserver> status_observers_;
+  base::ObserverList<HostStatusObserver> status_observers_;
 
   // Invoked to ask the owner to delete |this|.
   base::Closure stopped_callback_;
diff --git a/remoting/host/linux/audio_pipe_reader.cc b/remoting/host/linux/audio_pipe_reader.cc
index cd293f5..61a290d 100644
--- a/remoting/host/linux/audio_pipe_reader.cc
+++ b/remoting/host/linux/audio_pipe_reader.cc
@@ -48,7 +48,7 @@ AudioPipeReader::AudioPipeReader(
     const base::FilePath& pipe_path)
     : task_runner_(task_runner),
       pipe_path_(pipe_path),
-      observers_(new ObserverListThreadSafe<StreamObserver>()) {
+      observers_(new base::ObserverListThreadSafe<StreamObserver>()) {
 }
 
 AudioPipeReader::~AudioPipeReader() {}
diff --git a/remoting/host/linux/audio_pipe_reader.h b/remoting/host/linux/audio_pipe_reader.h
index 33b9b41..a5b9e4f 100644
--- a/remoting/host/linux/audio_pipe_reader.h
+++ b/remoting/host/linux/audio_pipe_reader.h
@@ -80,7 +80,7 @@ class AudioPipeReader
 
   base::File pipe_;
   base::RepeatingTimer<AudioPipeReader> timer_;
-  scoped_refptr<ObserverListThreadSafe<StreamObserver> > observers_;
+  scoped_refptr<base::ObserverListThreadSafe<StreamObserver>> observers_;
 
   // Size of the pipe buffer.
   int pipe_buffer_size_;
diff --git a/remoting/host/register_support_host_request_unittest.cc b/remoting/host/register_support_host_request_unittest.cc
index c5bb89d..d42e545 100644
--- a/remoting/host/register_support_host_request_unittest.cc
+++ b/remoting/host/register_support_host_request_unittest.cc
@@ -71,7 +71,7 @@ class RegisterSupportHostRequestTest : public testing::Test {
 
   base::MessageLoop message_loop_;
   MockSignalStrategy signal_strategy_;
-  ObserverList<SignalStrategy::Listener, true> signal_strategy_listeners_;
+  base::ObserverList<SignalStrategy::Listener, true> signal_strategy_listeners_;
   scoped_refptr<RsaKeyPair> key_pair_;
   MockCallback callback_;
 };
diff --git a/remoting/signaling/fake_signal_strategy.h b/remoting/signaling/fake_signal_strategy.h
index 0091ccf9..d0fb99a 100644
--- a/remoting/signaling/fake_signal_strategy.h
+++ b/remoting/signaling/fake_signal_strategy.h
@@ -72,7 +72,7 @@ class FakeSignalStrategy : public SignalStrategy,
 
   std::string jid_;
   PeerCallback peer_callback_;
-  ObserverList<Listener, true> listeners_;
+  base::ObserverList<Listener, true> listeners_;
 
   int last_id_;
 
diff --git a/remoting/signaling/xmpp_signal_strategy.cc b/remoting/signaling/xmpp_signal_strategy.cc
index 693ce19..0a55c34 100644
--- a/remoting/signaling/xmpp_signal_strategy.cc
+++ b/remoting/signaling/xmpp_signal_strategy.cc
@@ -112,7 +112,7 @@ class XmppSignalStrategy::Core : public XmppLoginHandler::Delegate {
 
   Error error_;
 
-  ObserverList<Listener, true> listeners_;
+  base::ObserverList<Listener, true> listeners_;
 
   base::Timer keep_alive_timer_;
 
diff --git a/remoting/test/test_chromoting_client.h b/remoting/test/test_chromoting_client.h
index 69f3967..823fe1a 100644
--- a/remoting/test/test_chromoting_client.h
+++ b/remoting/test/test_chromoting_client.h
@@ -99,7 +99,7 @@ class TestChromotingClient : public ClientUserInterface,
   // List of observers which are notified when remote connection events occur.
   // We specify true below for the 'check_empty' flag so the list will check to
   // see if all observers have been unregistered when it is destroyed.
-  ObserverList<RemoteConnectionObserver, true> connection_observers_;
+  base::ObserverList<RemoteConnectionObserver, true> connection_observers_;
 
   // ConnectionToHost used by TestChromotingClient tests.
   scoped_ptr<protocol::ConnectionToHost> test_connection_to_host_;
diff --git a/storage/browser/database/database_tracker.h b/storage/browser/database/database_tracker.h
index e9817a5..051fe1e 100644
--- a/storage/browser/database/database_tracker.h
+++ b/storage/browser/database/database_tracker.h
@@ -281,7 +281,7 @@ class STORAGE_EXPORT DatabaseTracker
   scoped_ptr<sql::Connection> db_;
   scoped_ptr<DatabasesTable> databases_table_;
   scoped_ptr<sql::MetaTable> meta_table_;
-  ObserverList<Observer, true> observers_;
+  base::ObserverList<Observer, true> observers_;
   std::map<std::string, CachedOriginInfo> origins_info_map_;
   DatabaseConnections database_connections_;
 
diff --git a/storage/browser/quota/special_storage_policy.h b/storage/browser/quota/special_storage_policy.h
index 276d6ac..d164e94 100644
--- a/storage/browser/quota/special_storage_policy.h
+++ b/storage/browser/quota/special_storage_policy.h
@@ -74,7 +74,7 @@ class STORAGE_EXPORT SpecialStoragePolicy
   void NotifyRevoked(const GURL& origin, int change_flags);
   void NotifyCleared();
 
-  ObserverList<Observer> observers_;
+  base::ObserverList<Observer> observers_;
 };
 
 }  // namespace storage
diff --git a/sync/engine/directory_commit_contribution_unittest.cc b/sync/engine/directory_commit_contribution_unittest.cc
index 6eed58e..ce0fa75 100644
--- a/sync/engine/directory_commit_contribution_unittest.cc
+++ b/sync/engine/directory_commit_contribution_unittest.cc
@@ -105,7 +105,7 @@ class DirectoryCommitContributionTest : public ::testing::Test {
   TestIdFactory id_factory_;
 
   // Used in construction of DirectoryTypeDebugInfoEmitters.
-  ObserverList<TypeDebugInfoObserver> type_observers_;
+  base::ObserverList<TypeDebugInfoObserver> type_observers_;
 
  private:
   base::MessageLoop loop_;  // Neeed to initialize the directory.
diff --git a/sync/engine/directory_update_handler_unittest.cc b/sync/engine/directory_update_handler_unittest.cc
index 2311d0f..6623cdb 100644
--- a/sync/engine/directory_update_handler_unittest.cc
+++ b/sync/engine/directory_update_handler_unittest.cc
@@ -92,7 +92,7 @@ class DirectoryUpdateHandlerProcessUpdateTest : public ::testing::Test {
 
  protected:
   // Used in the construction of DirectoryTypeDebugInfoEmitters.
-  ObserverList<TypeDebugInfoObserver> type_observers_;
+  base::ObserverList<TypeDebugInfoObserver> type_observers_;
 
  private:
   base::MessageLoop loop_;  // Needed to initialize the directory.
@@ -525,7 +525,7 @@ class DirectoryUpdateHandlerApplyUpdateTest : public ::testing::Test {
   scoped_refptr<FakeModelWorker> password_worker_;
   scoped_refptr<FakeModelWorker> passive_worker_;
 
-  ObserverList<TypeDebugInfoObserver> type_observers_;
+  base::ObserverList<TypeDebugInfoObserver> type_observers_;
   DirectoryTypeDebugInfoEmitter bookmarks_emitter_;
   DirectoryTypeDebugInfoEmitter passwords_emitter_;
   DirectoryTypeDebugInfoEmitter articles_emitter_;
diff --git a/sync/engine/net/server_connection_manager.h b/sync/engine/net/server_connection_manager.h
index 44edc48..6514290 100644
--- a/sync/engine/net/server_connection_manager.h
+++ b/sync/engine/net/server_connection_manager.h
@@ -288,7 +288,7 @@ class SYNC_EXPORT_PRIVATE ServerConnectionManager : public CancelationObserver {
   // The previous auth token that is invalid now.
   std::string previously_invalidated_token;
 
-  ObserverList<ServerConnectionEventListener> listeners_;
+  base::ObserverList<ServerConnectionEventListener> listeners_;
 
   HttpResponse::ServerConnectionCode server_status_;
 
diff --git a/sync/internal_api/public/test/fake_sync_manager.h b/sync/internal_api/public/test/fake_sync_manager.h
index 39d9ada..a3bbde7 100644
--- a/sync/internal_api/public/test/fake_sync_manager.h
+++ b/sync/internal_api/public/test/fake_sync_manager.h
@@ -119,7 +119,7 @@ class FakeSyncManager : public SyncManager {
  private:
   scoped_refptr<base::SequencedTaskRunner> sync_task_runner_;
 
-  ObserverList<SyncManager::Observer> observers_;
+  base::ObserverList<SyncManager::Observer> observers_;
 
   // Faked directory state.
   ModelTypeSet initial_sync_ended_types_;
diff --git a/sync/internal_api/sync_encryption_handler_impl.h b/sync/internal_api/sync_encryption_handler_impl.h
index 2db4c47..79f43f2 100644
--- a/sync/internal_api/sync_encryption_handler_impl.h
+++ b/sync/internal_api/sync_encryption_handler_impl.h
@@ -263,7 +263,7 @@ class SYNC_EXPORT_PRIVATE SyncEncryptionHandlerImpl
 
   base::ThreadChecker thread_checker_;
 
-  ObserverList<SyncEncryptionHandler::Observer> observers_;
+  base::ObserverList<SyncEncryptionHandler::Observer> observers_;
 
   // The current user share (for creating transactions).
   UserShare* user_share_;
diff --git a/sync/internal_api/sync_manager_impl.h b/sync/internal_api/sync_manager_impl.h
index 6e9795b..f07cbfb 100644
--- a/sync/internal_api/sync_manager_impl.h
+++ b/sync/internal_api/sync_manager_impl.h
@@ -273,7 +273,7 @@ class SYNC_EXPORT_PRIVATE SyncManagerImpl
   // OpenDirectory() and ShutdownOnSyncThread().
   WeakHandle<SyncManager::ChangeObserver> change_observer_;
 
-  ObserverList<SyncManager::Observer> observers_;
+  base::ObserverList<SyncManager::Observer> observers_;
 
   // The ServerConnectionManager used to abstract communication between the
   // client (the Syncer) and the sync server.
diff --git a/sync/internal_api/sync_rollback_manager_base.cc b/sync/internal_api/sync_rollback_manager_base.cc
index 647019f..a5501b7 100644
--- a/sync/internal_api/sync_rollback_manager_base.cc
+++ b/sync/internal_api/sync_rollback_manager_base.cc
@@ -309,7 +309,8 @@ void SyncRollbackManagerBase::InitBookmarkFolder(const std::string& folder) {
   entry.PutSpecifics(specifics);
 }
 
-ObserverList<SyncManager::Observer>* SyncRollbackManagerBase::GetObservers() {
+base::ObserverList<SyncManager::Observer>*
+SyncRollbackManagerBase::GetObservers() {
   return &observers_;
 }
 
diff --git a/sync/internal_api/sync_rollback_manager_base.h b/sync/internal_api/sync_rollback_manager_base.h
index 572ba74..a284f1f 100644
--- a/sync/internal_api/sync_rollback_manager_base.h
+++ b/sync/internal_api/sync_rollback_manager_base.h
@@ -92,7 +92,7 @@ class SYNC_EXPORT_PRIVATE SyncRollbackManagerBase :
       ModelTypeSet models_with_changes) override;
 
  protected:
-  ObserverList<SyncManager::Observer>* GetObservers();
+  base::ObserverList<SyncManager::Observer>* GetObservers();
 
   // Initialize sync backup DB.
   bool InitInternal(
@@ -126,7 +126,7 @@ class SYNC_EXPORT_PRIVATE SyncRollbackManagerBase :
   void InitBookmarkFolder(const std::string& folder);
 
   UserShare share_;
-  ObserverList<SyncManager::Observer> observers_;
+  base::ObserverList<SyncManager::Observer> observers_;
 
   scoped_ptr<UnrecoverableErrorHandler> unrecoverable_error_handler_;
   ReportUnrecoverableErrorFunction report_unrecoverable_error_function_;
diff --git a/sync/js/sync_js_controller.h b/sync/js/sync_js_controller.h
index 57a8aa8..62474bc 100644
--- a/sync/js/sync_js_controller.h
+++ b/sync/js/sync_js_controller.h
@@ -49,7 +49,7 @@ class SYNC_EXPORT SyncJsController
   void UpdateBackendEventHandler();
 
   WeakHandle<JsBackend> js_backend_;
-  ObserverList<JsEventHandler> js_event_handlers_;
+  base::ObserverList<JsEventHandler> js_event_handlers_;
 
   DISALLOW_COPY_AND_ASSIGN(SyncJsController);
 };
diff --git a/sync/sessions/directory_type_debug_info_emitter.cc b/sync/sessions/directory_type_debug_info_emitter.cc
index c8228d2..e1a89e8 100644
--- a/sync/sessions/directory_type_debug_info_emitter.cc
+++ b/sync/sessions/directory_type_debug_info_emitter.cc
@@ -14,17 +14,17 @@ namespace syncer {
 DirectoryTypeDebugInfoEmitter::DirectoryTypeDebugInfoEmitter(
     syncable::Directory* directory,
     syncer::ModelType type,
-    ObserverList<TypeDebugInfoObserver>* observers)
+    base::ObserverList<TypeDebugInfoObserver>* observers)
     : directory_(directory),
       type_(type),
-      type_debug_info_observers_(observers) {}
+      type_debug_info_observers_(observers) {
+}
 
 DirectoryTypeDebugInfoEmitter::DirectoryTypeDebugInfoEmitter(
     ModelType type,
-    ObserverList<TypeDebugInfoObserver>* observers)
-    : directory_(NULL),
-      type_(type),
-      type_debug_info_observers_(observers) {}
+    base::ObserverList<TypeDebugInfoObserver>* observers)
+    : directory_(NULL), type_(type), type_debug_info_observers_(observers) {
+}
 
 DirectoryTypeDebugInfoEmitter::~DirectoryTypeDebugInfoEmitter() {}
 
diff --git a/sync/sessions/directory_type_debug_info_emitter.h b/sync/sessions/directory_type_debug_info_emitter.h
index 672367d..254e3f9 100644
--- a/sync/sessions/directory_type_debug_info_emitter.h
+++ b/sync/sessions/directory_type_debug_info_emitter.h
@@ -43,12 +43,12 @@ class SYNC_EXPORT_PRIVATE DirectoryTypeDebugInfoEmitter {
   DirectoryTypeDebugInfoEmitter(
       syncable::Directory* directory,
       syncer::ModelType type,
-      ObserverList<TypeDebugInfoObserver>* observers);
+      base::ObserverList<TypeDebugInfoObserver>* observers);
 
   // A simple constructor for tests.  Should not be used in real code.
   DirectoryTypeDebugInfoEmitter(
       ModelType type,
-      ObserverList<TypeDebugInfoObserver>* observers);
+      base::ObserverList<TypeDebugInfoObserver>* observers);
 
   virtual ~DirectoryTypeDebugInfoEmitter();
 
@@ -88,7 +88,7 @@ class SYNC_EXPORT_PRIVATE DirectoryTypeDebugInfoEmitter {
   // doesn't make sense to have them manage their own observer list.  They all
   // share one observer list that is provided by their owner and which is
   // guaranteed to outlive them.
-  ObserverList<TypeDebugInfoObserver>* type_debug_info_observers_;
+  base::ObserverList<TypeDebugInfoObserver>* type_debug_info_observers_;
 
   DISALLOW_COPY_AND_ASSIGN(DirectoryTypeDebugInfoEmitter);
 };
diff --git a/sync/sessions/model_type_registry.h b/sync/sessions/model_type_registry.h
index 6cae55e..ccfc117 100644
--- a/sync/sessions/model_type_registry.h
+++ b/sync/sessions/model_type_registry.h
@@ -150,7 +150,7 @@ class SYNC_EXPORT_PRIVATE ModelTypeRegistry
   // a lot of them, and their lifetimes are unpredictable, so it makes the
   // book-keeping easier if we just store the list here.  That way it's
   // guaranteed to live as long as this sync backend.
-  ObserverList<TypeDebugInfoObserver> type_debug_info_observers_;
+  base::ObserverList<TypeDebugInfoObserver> type_debug_info_observers_;
 
   base::WeakPtrFactory<ModelTypeRegistry> weak_ptr_factory_;
 
diff --git a/sync/sessions/sync_session_context.h b/sync/sessions/sync_session_context.h
index 7fa4173..afce0a8 100644
--- a/sync/sessions/sync_session_context.h
+++ b/sync/sessions/sync_session_context.h
@@ -90,7 +90,7 @@ class SYNC_EXPORT_PRIVATE SyncSessionContext {
   }
   int32 max_commit_batch_size() const { return max_commit_batch_size_; }
 
-  ObserverList<SyncEngineEventListener>* listeners() {
+  base::ObserverList<SyncEngineEventListener>* listeners() {
     return &listeners_;
   }
 
@@ -129,7 +129,7 @@ class SYNC_EXPORT_PRIVATE SyncSessionContext {
   // once they are allocated. See definitions of these below.
   friend class TestScopedSessionEventListener;
 
-  ObserverList<SyncEngineEventListener> listeners_;
+  base::ObserverList<SyncEngineEventListener> listeners_;
 
   ServerConnectionManager* const connection_manager_;
   syncable::Directory* const directory_;
diff --git a/sync/test/fake_server/fake_server.h b/sync/test/fake_server/fake_server.h
index ecc8bd7..8478076 100644
--- a/sync/test/fake_server/fake_server.h
+++ b/sync/test/fake_server/fake_server.h
@@ -206,7 +206,7 @@ class FakeServer {
   int request_counter_;
 
   // FakeServer's observers.
-  ObserverList<Observer, true> observers_;
+  base::ObserverList<Observer, true> observers_;
 
   // When true, the server operates normally. When false, a failure is returned
   // on every request. This is used to simulate a network failure on the client.
diff --git a/sync/test/fake_sync_encryption_handler.h b/sync/test/fake_sync_encryption_handler.h
index c3180a6..c3ba20d 100644
--- a/sync/test/fake_sync_encryption_handler.h
+++ b/sync/test/fake_sync_encryption_handler.h
@@ -55,7 +55,7 @@ class FakeSyncEncryptionHandler : public SyncEncryptionHandler,
   Cryptographer* cryptographer() { return &cryptographer_; }
 
  private:
-  ObserverList<SyncEncryptionHandler::Observer> observers_;
+  base::ObserverList<SyncEncryptionHandler::Observer> observers_;
   ModelTypeSet encrypted_types_;
   bool encrypt_everything_;
   PassphraseType passphrase_type_;
diff --git a/third_party/mojo/src/mojo/edk/js/handle.h b/third_party/mojo/src/mojo/edk/js/handle.h
index 200b322..36e53c8 100644
--- a/third_party/mojo/src/mojo/edk/js/handle.h
+++ b/third_party/mojo/src/mojo/edk/js/handle.h
@@ -39,7 +39,7 @@ class HandleWrapper : public gin::Wrappable<HandleWrapper> {
   void NotifyCloseObservers();
 
   mojo::ScopedHandle handle_;
-  ObserverList<HandleCloseObserver> close_observers_;
+  base::ObserverList<HandleCloseObserver> close_observers_;
 };
 
 }  // namespace js
diff --git a/tools/valgrind/gtest_exclude/base_unittests.gtest.txt b/tools/valgrind/gtest_exclude/base_unittests.gtest.txt
index aa85c27..3a5ffe7 100644
--- a/tools/valgrind/gtest_exclude/base_unittests.gtest.txt
+++ b/tools/valgrind/gtest_exclude/base_unittests.gtest.txt
@@ -8,8 +8,8 @@ TimerTest.RepeatingTimer
 TimerTest.RepeatingTimer_Cancel
 
 # Crashes occasionally, see http://crbug.com/7477
-ObserverListThreadSafeTest.CrossThreadObserver
-ObserverListThreadSafeTest.CrossThreadNotifications
+base::ObserverListThreadSafeTest.CrossThreadObserver
+base::ObserverListThreadSafeTest.CrossThreadNotifications
 
 # Hangs sometimes on linux, see http://crbug.com/22138
 ClipboardTest.*
diff --git a/ui/android/window_android.h b/ui/android/window_android.h
index 005f4d6..a69a1dd 100644
--- a/ui/android/window_android.h
+++ b/ui/android/window_android.h
@@ -70,7 +70,7 @@ class UI_ANDROID_EXPORT WindowAndroid {
   gfx::Vector2dF content_offset_;
   WindowAndroidCompositor* compositor_;
 
-  ObserverList<WindowAndroidObserver> observer_list_;
+  base::ObserverList<WindowAndroidObserver> observer_list_;
 
   DISALLOW_COPY_AND_ASSIGN(WindowAndroid);
 };
diff --git a/ui/app_list/app_list_item.h b/ui/app_list/app_list_item.h
index ab5632f..ea476bb88d 100644
--- a/ui/app_list/app_list_item.h
+++ b/ui/app_list/app_list_item.h
@@ -133,7 +133,7 @@ class APP_LIST_EXPORT AppListItem {
   bool is_installing_;
   int percent_downloaded_;
 
-  ObserverList<AppListItemObserver> observers_;
+  base::ObserverList<AppListItemObserver> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(AppListItem);
 };
diff --git a/ui/app_list/app_list_item_list.h b/ui/app_list/app_list_item_list.h
index c4ad1d5..32b434e 100644
--- a/ui/app_list/app_list_item_list.h
+++ b/ui/app_list/app_list_item_list.h
@@ -106,7 +106,7 @@ class APP_LIST_EXPORT AppListItemList {
   void FixItemPosition(size_t index);
 
   ScopedVector<AppListItem> app_list_items_;
-  ObserverList<AppListItemListObserver, true> observers_;
+  base::ObserverList<AppListItemListObserver, true> observers_;
   std::string highlighted_id_;
 
   DISALLOW_COPY_AND_ASSIGN(AppListItemList);
diff --git a/ui/app_list/app_list_model.h b/ui/app_list/app_list_model.h
index 0bfd790..3845f5a 100644
--- a/ui/app_list/app_list_model.h
+++ b/ui/app_list/app_list_model.h
@@ -220,7 +220,7 @@ class APP_LIST_EXPORT AppListModel : public AppListItemListObserver {
 
   Status status_;
   State state_;
-  ObserverList<AppListModelObserver, true> observers_;
+  base::ObserverList<AppListModelObserver, true> observers_;
   bool folders_enabled_;
   bool custom_launcher_page_enabled_;
   std::string custom_launcher_page_name_;
diff --git a/ui/app_list/folder_image.h b/ui/app_list/folder_image.h
index 1842d97..785c690 100644
--- a/ui/app_list/folder_image.h
+++ b/ui/app_list/folder_image.h
@@ -93,7 +93,7 @@ class APP_LIST_EXPORT FolderImage : public AppListItemListObserver,
   // Top items for generating folder icon.
   std::vector<AppListItem*> top_items_;
 
-  ObserverList<FolderImageObserver> observers_;
+  base::ObserverList<FolderImageObserver> observers_;
 };
 
 }  // namespace app_list
diff --git a/ui/app_list/pagination_model.h b/ui/app_list/pagination_model.h
index 13c47ab..1959858 100644
--- a/ui/app_list/pagination_model.h
+++ b/ui/app_list/pagination_model.h
@@ -142,7 +142,7 @@ class APP_LIST_EXPORT PaginationModel : public gfx::AnimationDelegate {
   int last_overscroll_target_page_;
   base::TimeTicks last_overscroll_animation_start_time_;
 
-  ObserverList<PaginationModelObserver> observers_;
+  base::ObserverList<PaginationModelObserver> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(PaginationModel);
 };
diff --git a/ui/app_list/search/history_data.h b/ui/app_list/search/history_data.h
index f0932fc..deaa6ac 100644
--- a/ui/app_list/search/history_data.h
+++ b/ui/app_list/search/history_data.h
@@ -82,7 +82,7 @@ class APP_LIST_EXPORT HistoryData : public base::SupportsWeakPtr<HistoryData> {
   HistoryDataStore* store_;  // Not owned.
   const size_t max_primary_;
   const size_t max_secondary_;
-  ObserverList<HistoryDataObserver, true> observers_;
+  base::ObserverList<HistoryDataObserver, true> observers_;
 
   Associations associations_;
 
diff --git a/ui/app_list/search_box_model.h b/ui/app_list/search_box_model.h
index 9faaab2..cd35e70 100644
--- a/ui/app_list/search_box_model.h
+++ b/ui/app_list/search_box_model.h
@@ -87,7 +87,7 @@ class APP_LIST_EXPORT SearchBoxModel {
   gfx::SelectionModel selection_model_;
   base::string16 text_;
 
-  ObserverList<SearchBoxModelObserver> observers_;
+  base::ObserverList<SearchBoxModelObserver> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(SearchBoxModel);
 };
diff --git a/ui/app_list/search_result.h b/ui/app_list/search_result.h
index 69c9db4..a09e186 100644
--- a/ui/app_list/search_result.h
+++ b/ui/app_list/search_result.h
@@ -195,7 +195,7 @@ class APP_LIST_EXPORT SearchResult {
   bool is_installing_;
   int percent_downloaded_;
 
-  ObserverList<SearchResultObserver> observers_;
+  base::ObserverList<SearchResultObserver> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(SearchResult);
 };
diff --git a/ui/app_list/speech_ui_model.h b/ui/app_list/speech_ui_model.h
index 353796d..9ee7e86 100644
--- a/ui/app_list/speech_ui_model.h
+++ b/ui/app_list/speech_ui_model.h
@@ -52,7 +52,7 @@ class APP_LIST_EXPORT SpeechUIModel {
   int16 minimum_sound_level_;
   int16 maximum_sound_level_;
 
-  ObserverList<SpeechUIModelObserver> observers_;
+  base::ObserverList<SpeechUIModelObserver> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(SpeechUIModel);
 };
diff --git a/ui/app_list/test/app_list_test_view_delegate.h b/ui/app_list/test/app_list_test_view_delegate.h
index 54239a9..cc2670c 100644
--- a/ui/app_list/test/app_list_test_view_delegate.h
+++ b/ui/app_list/test/app_list_test_view_delegate.h
@@ -102,7 +102,7 @@ class AppListTestViewDelegate : public AppListViewDelegate {
   std::map<size_t, int> open_search_result_counts_;
   Users users_;
   scoped_ptr<AppListTestModel> model_;
-  ObserverList<AppListViewDelegateObserver> observers_;
+  base::ObserverList<AppListViewDelegateObserver> observers_;
   SpeechUIModel speech_ui_;
   base::TimeDelta auto_launch_timeout_;
 
diff --git a/ui/app_list/views/app_list_view.h b/ui/app_list/views/app_list_view.h
index 27e6e8a..6c3dfc7 100644
--- a/ui/app_list/views/app_list_view.h
+++ b/ui/app_list/views/app_list_view.h
@@ -181,7 +181,7 @@ class APP_LIST_EXPORT AppListView : public views::BubbleDelegateView,
   // open.
   views::View* overlay_view_;
 
-  ObserverList<AppListViewObserver> observers_;
+  base::ObserverList<AppListViewObserver> observers_;
   scoped_ptr<HideViewAnimationObserver> animation_observer_;
 
   // For UMA and testing. If non-null, triggered when the app list is painted.
diff --git a/ui/app_list/views/top_icon_animation_view.h b/ui/app_list/views/top_icon_animation_view.h
index 787b384..eea32db 100644
--- a/ui/app_list/views/top_icon_animation_view.h
+++ b/ui/app_list/views/top_icon_animation_view.h
@@ -68,7 +68,7 @@ class TopIconAnimationView : public views::View,
   // true: opening folder; false: closing folder.
   bool open_folder_;
 
-  ObserverList<TopIconAnimationObserver> observers_;
+  base::ObserverList<TopIconAnimationObserver> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(TopIconAnimationView);
 };
diff --git a/ui/aura/env.h b/ui/aura/env.h
index 9b84c3b..6fbcb17 100644
--- a/ui/aura/env.h
+++ b/ui/aura/env.h
@@ -93,7 +93,7 @@ class AURA_EXPORT Env : public ui::EventTarget, public base::SupportsUserData {
   scoped_ptr<ui::EventTargetIterator> GetChildIterator() const override;
   ui::EventTargeter* GetEventTargeter() override;
 
-  ObserverList<EnvObserver> observers_;
+  base::ObserverList<EnvObserver> observers_;
 
   int mouse_button_flags_;
   // Location of last mouse event, in screen coordinates.
diff --git a/ui/aura/test/test_cursor_client.h b/ui/aura/test/test_cursor_client.h
index b741455..c5412d2 100644
--- a/ui/aura/test/test_cursor_client.h
+++ b/ui/aura/test/test_cursor_client.h
@@ -56,7 +56,7 @@ class TestCursorClient : public aura::client::CursorClient {
   bool mouse_events_enabled_;
   int cursor_lock_count_;
   int calls_to_set_cursor_;
-  ObserverList<aura::client::CursorClientObserver> observers_;
+  base::ObserverList<aura::client::CursorClientObserver> observers_;
   aura::Window* root_window_;
 
   DISALLOW_COPY_AND_ASSIGN(TestCursorClient);
diff --git a/ui/aura/window.cc b/ui/aura/window.cc
index 69bddfd..1e293b7 100644
--- a/ui/aura/window.cc
+++ b/ui/aura/window.cc
@@ -197,7 +197,7 @@ Window::Window(WindowDelegate* delegate)
       // Don't notify newly added observers during notification. This causes
       // problems for code that adds an observer as part of an observer
       // notification (such as the workspace code).
-      observers_(ObserverList<WindowObserver>::NOTIFY_EXISTING_ONLY) {
+      observers_(base::ObserverList<WindowObserver>::NOTIFY_EXISTING_ONLY) {
   set_target_handler(delegate_);
 }
 
diff --git a/ui/aura/window.h b/ui/aura/window.h
index 42cab33..0a82a02 100644
--- a/ui/aura/window.h
+++ b/ui/aura/window.h
@@ -532,7 +532,7 @@ class AURA_EXPORT Window : public ui::LayerDelegate,
   // See set_hit_test_bounds_override_inner().
   gfx::Insets hit_test_bounds_override_inner_;
 
-  ObserverList<WindowObserver, true> observers_;
+  base::ObserverList<WindowObserver, true> observers_;
 
   // Value struct to keep the name and deallocator for this property.
   // Key cannot be used for this purpose because it can be char* or
diff --git a/ui/aura/window_tree_host.h b/ui/aura/window_tree_host.h
index 0d09093..f4dc23e 100644
--- a/ui/aura/window_tree_host.h
+++ b/ui/aura/window_tree_host.h
@@ -180,7 +180,7 @@ class AURA_EXPORT WindowTreeHost {
   // the dtor).
   Window* window_;  // Owning.
 
-  ObserverList<WindowTreeHostObserver> observers_;
+  base::ObserverList<WindowTreeHostObserver> observers_;
 
   scoped_ptr<WindowEventDispatcher> dispatcher_;
 
diff --git a/ui/base/ime/chromeos/ime_keyboard.h b/ui/base/ime/chromeos/ime_keyboard.h
index 2c0e912..2885a2a 100644
--- a/ui/base/ime/chromeos/ime_keyboard.h
+++ b/ui/base/ime/chromeos/ime_keyboard.h
@@ -116,7 +116,7 @@ class UI_BASE_IME_EXPORT ImeKeyboard {
   std::string last_layout_;
 
  private:
-  ObserverList<Observer> observers_;
+  base::ObserverList<Observer> observers_;
 };
 
 }  // namespace input_method
diff --git a/ui/base/ime/input_method_base.h b/ui/base/ime/input_method_base.h
index 6378388..eb81738 100644
--- a/ui/base/ime/input_method_base.h
+++ b/ui/base/ime/input_method_base.h
@@ -95,7 +95,7 @@ class UI_BASE_IME_EXPORT InputMethodBase
   internal::InputMethodDelegate* delegate_;
   TextInputClient* text_input_client_;
 
-  ObserverList<InputMethodObserver> observer_list_;
+  base::ObserverList<InputMethodObserver> observer_list_;
 
   bool system_toplevel_window_focused_;
 
diff --git a/ui/base/ime/mock_input_method.h b/ui/base/ime/mock_input_method.h
index 67cc299..305a80f 100644
--- a/ui/base/ime/mock_input_method.h
+++ b/ui/base/ime/mock_input_method.h
@@ -56,7 +56,7 @@ class UI_BASE_IME_EXPORT MockInputMethod
 
  private:
   TextInputClient* text_input_client_;
-  ObserverList<InputMethodObserver> observer_list_;
+  base::ObserverList<InputMethodObserver> observer_list_;
 
   DISALLOW_COPY_AND_ASSIGN(MockInputMethod);
 };
diff --git a/ui/base/ime/remote_input_method_win.cc b/ui/base/ime/remote_input_method_win.cc
index 9735b0e..4f0ab62 100644
--- a/ui/base/ime/remote_input_method_win.cc
+++ b/ui/base/ime/remote_input_method_win.cc
@@ -338,7 +338,7 @@ class RemoteInputMethodWin : public InputMethod,
            remote_delegate_;
   }
 
-  ObserverList<InputMethodObserver> observer_list_;
+  base::ObserverList<InputMethodObserver> observer_list_;
 
   internal::InputMethodDelegate* delegate_;
   internal::RemoteInputMethodDelegateWin* remote_delegate_;
diff --git a/ui/base/models/list_model.h b/ui/base/models/list_model.h
index e358d84..6ed660f 100644
--- a/ui/base/models/list_model.h
+++ b/ui/base/models/list_model.h
@@ -134,7 +134,7 @@ class ListModel {
 
  private:
   ScopedVector<ItemType> items_;
-  ObserverList<ListModelObserver> observers_;
+  base::ObserverList<ListModelObserver> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(ListModel<ItemType>);
 };
diff --git a/ui/base/models/tree_node_model.h b/ui/base/models/tree_node_model.h
index 3ebbcee..5118578 100644
--- a/ui/base/models/tree_node_model.h
+++ b/ui/base/models/tree_node_model.h
@@ -292,7 +292,7 @@ class TreeNodeModel : public TreeModel {
 
  private:
   // The observers.
-  ObserverList<TreeModelObserver> observer_list_;
+  base::ObserverList<TreeModelObserver> observer_list_;
 
   // The root.
   scoped_ptr<NodeType> root_;
diff --git a/ui/base/user_activity/user_activity_detector.h b/ui/base/user_activity/user_activity_detector.h
index a7665a8..4ec398f9 100644
--- a/ui/base/user_activity/user_activity_detector.h
+++ b/ui/base/user_activity/user_activity_detector.h
@@ -62,7 +62,7 @@ class UI_BASE_EXPORT UserActivityDetector : public ui::PlatformEventObserver {
   // since the last notification.
   void HandleActivity(const ui::Event* event);
 
-  ObserverList<UserActivityObserver> observers_;
+  base::ObserverList<UserActivityObserver> observers_;
 
   // Last time at which user activity was observed.
   base::TimeTicks last_activity_time_;
diff --git a/ui/chromeos/ime/candidate_window_view.h b/ui/chromeos/ime/candidate_window_view.h
index e4846fe..6861e1b 100644
--- a/ui/chromeos/ime/candidate_window_view.h
+++ b/ui/chromeos/ime/candidate_window_view.h
@@ -93,7 +93,7 @@ class UI_CHROMEOS_EXPORT CandidateWindowView : public views::BubbleDelegateView,
   int selected_candidate_index_in_page_;
 
   // The observers of the object.
-  ObserverList<Observer> observers_;
+  base::ObserverList<Observer> observers_;
 
   // Views created in the class will be part of tree of |this|, so these
   // child views will be deleted when |this| is deleted.
diff --git a/ui/chromeos/ime/input_method_menu_manager.h b/ui/chromeos/ime/input_method_menu_manager.h
index c1de537..3c3ddb4 100644
--- a/ui/chromeos/ime/input_method_menu_manager.h
+++ b/ui/chromeos/ime/input_method_menu_manager.h
@@ -53,7 +53,7 @@ public:
   InputMethodMenuItemList menu_list_;
 
   // Observers who will be notified when menu changes.
-  ObserverList<Observer> observers_;
+  base::ObserverList<Observer> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(InputMethodMenuManager);
 };
diff --git a/ui/chromeos/network/network_icon_animation.h b/ui/chromeos/network/network_icon_animation.h
index 56ed2a2..f37791b 100644
--- a/ui/chromeos/network/network_icon_animation.h
+++ b/ui/chromeos/network/network_icon_animation.h
@@ -39,7 +39,7 @@ class UI_CHROMEOS_EXPORT NetworkIconAnimation : public gfx::AnimationDelegate {
 
  private:
   gfx::ThrobAnimation animation_;
-  ObserverList<AnimationObserver> observers_;
+  base::ObserverList<AnimationObserver> observers_;
 };
 
 }  // namespace network_icon
diff --git a/ui/compositor/compositor.h b/ui/compositor/compositor.h
index 3101bc2..e82c49d 100644
--- a/ui/compositor/compositor.h
+++ b/ui/compositor/compositor.h
@@ -334,8 +334,8 @@ class COMPOSITOR_EXPORT Compositor
   // The root of the Layer tree drawn by this compositor.
   Layer* root_layer_;
 
-  ObserverList<CompositorObserver, true> observer_list_;
-  ObserverList<CompositorAnimationObserver> animation_observer_list_;
+  base::ObserverList<CompositorObserver, true> observer_list_;
+  base::ObserverList<CompositorAnimationObserver> animation_observer_list_;
   std::list<CompositorBeginFrameObserver*> begin_frame_observer_list_;
 
   gfx::AcceleratedWidget widget_;
diff --git a/ui/compositor/compositor_vsync_manager.h b/ui/compositor/compositor_vsync_manager.h
index 7e9e07b..9f3e688 100644
--- a/ui/compositor/compositor_vsync_manager.h
+++ b/ui/compositor/compositor_vsync_manager.h
@@ -51,7 +51,7 @@ class COMPOSITOR_EXPORT CompositorVSyncManager
 
   void NotifyObservers(base::TimeTicks timebase, base::TimeDelta interval);
 
-  ObserverList<Observer> observer_list_;
+  base::ObserverList<Observer> observer_list_;
 
   base::TimeTicks last_timebase_;
   base::TimeDelta last_interval_;
diff --git a/ui/compositor/layer_animation_sequence.h b/ui/compositor/layer_animation_sequence.h
index 19635ad..0dad650 100644
--- a/ui/compositor/layer_animation_sequence.h
+++ b/ui/compositor/layer_animation_sequence.h
@@ -176,7 +176,7 @@ class COMPOSITOR_EXPORT LayerAnimationSequence
   int animation_group_id_;
 
   // These parties are notified when layer animations end.
-  ObserverList<LayerAnimationObserver> observers_;
+  base::ObserverList<LayerAnimationObserver> observers_;
 
   // Tracks the last_progressed_fraction() of the most recently progressed
   // element.
diff --git a/ui/compositor/layer_animator.h b/ui/compositor/layer_animator.h
index 69744f8..99b3765 100644
--- a/ui/compositor/layer_animator.h
+++ b/ui/compositor/layer_animator.h
@@ -349,7 +349,7 @@ class COMPOSITOR_EXPORT LayerAnimator : public base::RefCounted<LayerAnimator> {
 
   // Observers are notified when layer animations end, are scheduled or are
   // aborted.
-  ObserverList<LayerAnimationObserver> observers_;
+  base::ObserverList<LayerAnimationObserver> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(LayerAnimator);
 };
diff --git a/ui/display/chromeos/display_configurator.h b/ui/display/chromeos/display_configurator.h
index d185301..5564aa3 100644
--- a/ui/display/chromeos/display_configurator.h
+++ b/ui/display/chromeos/display_configurator.h
@@ -398,7 +398,7 @@ class DISPLAY_EXPORT DisplayConfigurator : public NativeDisplayObserver {
   // Most-recently-used framebuffer size.
   gfx::Size framebuffer_size_;
 
-  ObserverList<Observer> observers_;
+  base::ObserverList<Observer> observers_;
 
   // The timer to delay configuring displays. This is used to aggregate multiple
   // display configuration events when they are reported in short time spans.
diff --git a/ui/display/chromeos/x11/native_display_delegate_x11.h b/ui/display/chromeos/x11/native_display_delegate_x11.h
index d201e5a..fadcf56 100644
--- a/ui/display/chromeos/x11/native_display_delegate_x11.h
+++ b/ui/display/chromeos/x11/native_display_delegate_x11.h
@@ -163,7 +163,7 @@ class DISPLAY_EXPORT NativeDisplayDelegateX11 : public NativeDisplayDelegate {
   scoped_ptr<NativeDisplayEventDispatcherX11> platform_event_dispatcher_;
 
   // List of observers waiting for display configuration change events.
-  ObserverList<NativeDisplayObserver> observers_;
+  base::ObserverList<NativeDisplayObserver> observers_;
 
   // A background color used during boot time + multi displays.
   uint32_t background_color_argb_;
diff --git a/ui/events/devices/device_data_manager.h b/ui/events/devices/device_data_manager.h
index 674676e..e8092aa 100644
--- a/ui/events/devices/device_data_manager.h
+++ b/ui/events/devices/device_data_manager.h
@@ -88,7 +88,7 @@ class EVENTS_DEVICES_EXPORT DeviceDataManager
   std::vector<InputDevice> mouse_devices_;
   std::vector<InputDevice> touchpad_devices_;
 
-  ObserverList<InputDeviceEventObserver> observers_;
+  base::ObserverList<InputDeviceEventObserver> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(DeviceDataManager);
 };
diff --git a/ui/events/ozone/device/device_manager_manual.h b/ui/events/ozone/device/device_manager_manual.h
index d158365..5e59c55 100644
--- a/ui/events/ozone/device/device_manager_manual.h
+++ b/ui/events/ozone/device/device_manager_manual.h
@@ -32,7 +32,7 @@ class DeviceManagerManual : public DeviceManager {
 
   bool have_scanned_devices_;
   std::vector<base::FilePath> devices_;
-  ObserverList<DeviceEventObserver> observers_;
+  base::ObserverList<DeviceEventObserver> observers_;
 
   base::WeakPtrFactory<DeviceManagerManual> weak_ptr_factory_;
 
diff --git a/ui/events/ozone/device/udev/device_manager_udev.h b/ui/events/ozone/device/udev/device_manager_udev.h
index f3922db..8031c80 100644
--- a/ui/events/ozone/device/udev/device_manager_udev.h
+++ b/ui/events/ozone/device/udev/device_manager_udev.h
@@ -41,7 +41,7 @@ class DeviceManagerUdev
 
   base::MessagePumpLibevent::FileDescriptorWatcher controller_;
 
-  ObserverList<DeviceEventObserver> observers_;
+  base::ObserverList<DeviceEventObserver> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(DeviceManagerUdev);
 };
diff --git a/ui/events/platform/platform_event_source.cc b/ui/events/platform/platform_event_source.cc
index bf957f0..99f69ac 100644
--- a/ui/events/platform/platform_event_source.cc
+++ b/ui/events/platform/platform_event_source.cc
@@ -76,7 +76,7 @@ uint32_t PlatformEventSource::DispatchEvent(PlatformEvent platform_event) {
 
   if ((action & POST_DISPATCH_PERFORM_DEFAULT) &&
       dispatchers_.might_have_observers()) {
-    ObserverList<PlatformEventDispatcher>::Iterator iter(&dispatchers_);
+    base::ObserverList<PlatformEventDispatcher>::Iterator iter(&dispatchers_);
     while (PlatformEventDispatcher* dispatcher = iter.GetNext()) {
       if (dispatcher->CanDispatchEvent(platform_event))
         action = dispatcher->DispatchEvent(platform_event);
diff --git a/ui/events/platform/platform_event_source.h b/ui/events/platform/platform_event_source.h
index 009476c..a20fe6b 100644
--- a/ui/events/platform/platform_event_source.h
+++ b/ui/events/platform/platform_event_source.h
@@ -81,10 +81,12 @@ class EVENTS_EXPORT PlatformEventSource {
 
   void OnOverriddenDispatcherRestored();
 
-  // Use an ObserverList<> instead of an std::vector<> to store the list of
+  // Use an base::ObserverList<> instead of an std::vector<> to store the list
+  // of
   // dispatchers, so that adding/removing dispatchers during an event dispatch
   // is well-defined.
-  typedef ObserverList<PlatformEventDispatcher> PlatformEventDispatcherList;
+  typedef base::ObserverList<PlatformEventDispatcher>
+      PlatformEventDispatcherList;
   PlatformEventDispatcherList dispatchers_;
   PlatformEventDispatcher* overridden_dispatcher_;
 
@@ -92,7 +94,7 @@ class EVENTS_EXPORT PlatformEventSource {
   // reset and a previous override-dispatcher has been restored.
   bool overridden_dispatcher_restored_;
 
-  ObserverList<PlatformEventObserver> observers_;
+  base::ObserverList<PlatformEventObserver> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(PlatformEventSource);
 };
diff --git a/ui/gfx/display_change_notifier.h b/ui/gfx/display_change_notifier.h
index 041f0f7..2a93217 100644
--- a/ui/gfx/display_change_notifier.h
+++ b/ui/gfx/display_change_notifier.h
@@ -32,7 +32,7 @@ class GFX_EXPORT DisplayChangeNotifier {
  private:
   // The observers that need to be notified when a display is modified, added
   // or removed.
-  ObserverList<DisplayObserver> observer_list_;
+  base::ObserverList<DisplayObserver> observer_list_;
 
   DISALLOW_COPY_AND_ASSIGN(DisplayChangeNotifier);
 };
diff --git a/ui/gfx/sys_color_change_listener.cc b/ui/gfx/sys_color_change_listener.cc
index 5291a1e..771e5c0 100644
--- a/ui/gfx/sys_color_change_listener.cc
+++ b/ui/gfx/sys_color_change_listener.cc
@@ -67,7 +67,7 @@ class SysColorChangeObserver {
 
   void OnWndProc(HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam);
 
-  ObserverList<SysColorChangeListener> listeners_;
+  base::ObserverList<SysColorChangeListener> listeners_;
   scoped_ptr<gfx::SingletonHwndObserver> singleton_hwnd_observer_;
 };
 
diff --git a/ui/gfx/win/singleton_hwnd.h b/ui/gfx/win/singleton_hwnd.h
index 789a60f..ea62b3e 100644
--- a/ui/gfx/win/singleton_hwnd.h
+++ b/ui/gfx/win/singleton_hwnd.h
@@ -44,7 +44,7 @@ class GFX_EXPORT SingletonHwnd : public WindowImpl {
   void RemoveObserver(SingletonHwndObserver* observer);
 
   // List of registered observers.
-  ObserverList<SingletonHwndObserver, true> observer_list_;
+  base::ObserverList<SingletonHwndObserver, true> observer_list_;
 
   DISALLOW_COPY_AND_ASSIGN(SingletonHwnd);
 };
diff --git a/ui/gl/gpu_switching_manager.h b/ui/gl/gpu_switching_manager.h
index 3f1acc2..ba60945 100644
--- a/ui/gl/gpu_switching_manager.h
+++ b/ui/gl/gpu_switching_manager.h
@@ -71,7 +71,7 @@ class GL_EXPORT GpuSwitchingManager {
   struct PlatformSpecific;
   scoped_ptr<PlatformSpecific> platform_specific_;
 
-  ObserverList<GpuSwitchingObserver> observer_list_;
+  base::ObserverList<GpuSwitchingObserver> observer_list_;
 
   DISALLOW_COPY_AND_ASSIGN(GpuSwitchingManager);
 };
diff --git a/ui/keyboard/keyboard_controller.h b/ui/keyboard/keyboard_controller.h
index 41650cc..a5156bb 100644
--- a/ui/keyboard/keyboard_controller.h
+++ b/ui/keyboard/keyboard_controller.h
@@ -181,7 +181,7 @@ class KEYBOARD_EXPORT KeyboardController : public ui::InputMethodObserver,
   KeyboardMode keyboard_mode_;
   ui::TextInputType type_;
 
-  ObserverList<KeyboardControllerObserver> observer_list_;
+  base::ObserverList<KeyboardControllerObserver> observer_list_;
 
   // The currently used keyboard position.
   gfx::Rect current_keyboard_bounds_;
diff --git a/ui/message_center/message_center_impl.h b/ui/message_center/message_center_impl.h
index d84e514..272ea2c 100644
--- a/ui/message_center/message_center_impl.h
+++ b/ui/message_center/message_center_impl.h
@@ -215,7 +215,7 @@ class MessageCenterImpl : public MessageCenter,
 
   scoped_ptr<NotificationList> notification_list_;
   NotificationCache notification_cache_;
-  ObserverList<MessageCenterObserver> observer_list_;
+  base::ObserverList<MessageCenterObserver> observer_list_;
   scoped_ptr<internal::PopupTimersController> popup_timers_controller_;
   scoped_ptr<base::OneShotTimer<MessageCenterImpl> > quiet_mode_timer_;
   NotifierSettingsProvider* settings_provider_;
diff --git a/ui/message_center/notification_blocker.h b/ui/message_center/notification_blocker.h
index 385b985..4bcb361 100644
--- a/ui/message_center/notification_blocker.h
+++ b/ui/message_center/notification_blocker.h
@@ -47,7 +47,7 @@ class MESSAGE_CENTER_EXPORT NotificationBlocker {
   void NotifyBlockingStateChanged();
 
  private:
-  ObserverList<Observer> observers_;
+  base::ObserverList<Observer> observers_;
   MessageCenter* message_center_;  // weak
 };
 
diff --git a/ui/native_theme/native_theme.h b/ui/native_theme/native_theme.h
index 75d9820..9ceae9d 100644
--- a/ui/native_theme/native_theme.h
+++ b/ui/native_theme/native_theme.h
@@ -360,7 +360,7 @@ class NATIVE_THEME_EXPORT NativeTheme {
 
  private:
   // Observers to notify when the native theme changes.
-  ObserverList<NativeThemeObserver> native_theme_observers_;
+  base::ObserverList<NativeThemeObserver> native_theme_observers_;
 
   DISALLOW_COPY_AND_ASSIGN(NativeTheme);
 };
diff --git a/ui/ozone/platform/drm/host/drm_gpu_platform_support_host.h b/ui/ozone/platform/drm/host/drm_gpu_platform_support_host.h
index 25f37da..1bf4080 100644
--- a/ui/ozone/platform/drm/host/drm_gpu_platform_support_host.h
+++ b/ui/ozone/platform/drm/host/drm_gpu_platform_support_host.h
@@ -58,7 +58,7 @@ class DrmGpuPlatformSupportHost : public GpuPlatformSupportHost,
 
   std::vector<GpuPlatformSupportHost*> handlers_;  // Not owned.
   DrmCursor* cursor_;                              // Not owned.
-  ObserverList<ChannelObserver> channel_observers_;
+  base::ObserverList<ChannelObserver> channel_observers_;
 };
 
 }  // namespace ui
diff --git a/ui/ozone/platform/drm/host/drm_native_display_delegate.h b/ui/ozone/platform/drm/host/drm_native_display_delegate.h
index 262db86..6b8e690 100644
--- a/ui/ozone/platform/drm/host/drm_native_display_delegate.h
+++ b/ui/ozone/platform/drm/host/drm_native_display_delegate.h
@@ -57,7 +57,7 @@ class DrmNativeDisplayDelegate : public NativeDisplayDelegate {
  private:
   DrmDisplayHostManager* display_manager_;  // Not owned.
 
-  ObserverList<NativeDisplayObserver> observers_;
+  base::ObserverList<NativeDisplayObserver> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(DrmNativeDisplayDelegate);
 };
diff --git a/ui/snapshot/screenshot_grabber.h b/ui/snapshot/screenshot_grabber.h
index 6a1e1cc..8461ce8 100644
--- a/ui/snapshot/screenshot_grabber.h
+++ b/ui/snapshot/screenshot_grabber.h
@@ -90,7 +90,7 @@ class SNAPSHOT_EXPORT ScreenshotGrabber {
   // Task runner for blocking tasks.
   scoped_refptr<base::TaskRunner> blocking_task_runner_;
 
-  ObserverList<ScreenshotGrabberObserver> observers_;
+  base::ObserverList<ScreenshotGrabberObserver> observers_;
   base::WeakPtrFactory<ScreenshotGrabber> factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ScreenshotGrabber);
diff --git a/ui/views/animation/bounds_animator.h b/ui/views/animation/bounds_animator.h
index 567e160..b5602ca 100644
--- a/ui/views/animation/bounds_animator.h
+++ b/ui/views/animation/bounds_animator.h
@@ -156,7 +156,7 @@ class VIEWS_EXPORT BoundsAnimator : public gfx::AnimationDelegate,
   // Parent of all views being animated.
   View* parent_;
 
-  ObserverList<BoundsAnimatorObserver> observers_;
+  base::ObserverList<BoundsAnimatorObserver> observers_;
 
   // All animations we create up with the same container.
   scoped_refptr<gfx::AnimationContainer> container_;
diff --git a/ui/views/controls/menu/native_menu_win.h b/ui/views/controls/menu/native_menu_win.h
index 3cbc25f..3d4dcd1 100644
--- a/ui/views/controls/menu/native_menu_win.h
+++ b/ui/views/controls/menu/native_menu_win.h
@@ -137,7 +137,7 @@ class VIEWS_EXPORT NativeMenuWin : public MenuWrapper {
   MenuAction menu_action_;
 
   // A list of listeners to call when the menu opens.
-  ObserverList<MenuListener> listeners_;
+  base::ObserverList<MenuListener> listeners_;
 
   // Keep track of whether the listeners have already been called at least
   // once.
diff --git a/ui/views/focus/focus_manager.h b/ui/views/focus/focus_manager.h
index c3e953f..4030158 100644
--- a/ui/views/focus/focus_manager.h
+++ b/ui/views/focus/focus_manager.h
@@ -371,7 +371,7 @@ class VIEWS_EXPORT FocusManager {
   FocusChangeReason focus_change_reason_;
 
   // The list of registered FocusChange listeners.
-  ObserverList<FocusChangeListener, true> focus_change_listeners_;
+  base::ObserverList<FocusChangeListener, true> focus_change_listeners_;
 
   // See description above getter.
   bool is_changing_focus_;
diff --git a/ui/views/focus/widget_focus_manager.h b/ui/views/focus/widget_focus_manager.h
index 7dc5fa4..f87814a 100644
--- a/ui/views/focus/widget_focus_manager.h
+++ b/ui/views/focus/widget_focus_manager.h
@@ -53,7 +53,7 @@ class VIEWS_EXPORT WidgetFocusManager {
   WidgetFocusManager();
   ~WidgetFocusManager();
 
-  ObserverList<WidgetFocusChangeListener> focus_change_listeners_;
+  base::ObserverList<WidgetFocusChangeListener> focus_change_listeners_;
 
   bool enabled_;
 
diff --git a/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h b/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h
index 94d4b1b..b726445 100644
--- a/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h
+++ b/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h
@@ -319,7 +319,7 @@ class VIEWS_EXPORT DesktopWindowTreeHostX11
   DesktopWindowTreeHostX11* window_parent_;
   std::set<DesktopWindowTreeHostX11*> window_children_;
 
-  ObserverList<DesktopWindowTreeHostObserverX11> observer_list_;
+  base::ObserverList<DesktopWindowTreeHostObserverX11> observer_list_;
 
   // The window shape if the window is non-rectangular.
   gfx::XScopedPtr<_XRegion, gfx::XObjectDeleter<_XRegion, int, XDestroyRegion>>
diff --git a/ui/views/widget/widget.h b/ui/views/widget/widget.h
index 16d6640..9c21ea2 100644
--- a/ui/views/widget/widget.h
+++ b/ui/views/widget/widget.h
@@ -876,9 +876,9 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate,
 
   internal::NativeWidgetPrivate* native_widget_;
 
-  ObserverList<WidgetObserver> observers_;
+  base::ObserverList<WidgetObserver> observers_;
 
-  ObserverList<WidgetRemovalsObserver> removals_observers_;
+  base::ObserverList<WidgetRemovalsObserver> removals_observers_;
 
   // Non-owned pointer to the Widget's delegate. If a NULL delegate is supplied
   // to Init() a default WidgetDelegate is created.
diff --git a/ui/views/win/windows_session_change_observer.cc b/ui/views/win/windows_session_change_observer.cc
index dbbe91d..627d4d0 100644
--- a/ui/views/win/windows_session_change_observer.cc
+++ b/ui/views/win/windows_session_change_observer.cc
@@ -99,7 +99,7 @@ class WindowsSessionChangeObserver::WtsRegistrationNotificationManager {
                       ClearCallback());
   }
 
-  ObserverList<WindowsSessionChangeObserver, true> observer_list_;
+  base::ObserverList<WindowsSessionChangeObserver, true> observer_list_;
   scoped_ptr<gfx::SingletonHwndObserver> singleton_hwnd_observer_;
 
   DISALLOW_COPY_AND_ASSIGN(WtsRegistrationNotificationManager);
diff --git a/ui/wm/core/compound_event_filter.h b/ui/wm/core/compound_event_filter.h
index c6f133f..26da51d8 100644
--- a/ui/wm/core/compound_event_filter.h
+++ b/ui/wm/core/compound_event_filter.h
@@ -80,7 +80,7 @@ class WM_EXPORT CompoundEventFilter : public ui::EventHandler {
   void OnGestureEvent(ui::GestureEvent* event) override;
 
   // Additional pre-target event handlers.
-  ObserverList<ui::EventHandler, true> handlers_;
+  base::ObserverList<ui::EventHandler, true> handlers_;
 
   DISALLOW_COPY_AND_ASSIGN(CompoundEventFilter);
 };
diff --git a/ui/wm/core/cursor_manager.h b/ui/wm/core/cursor_manager.h
index 8288b22..168f104 100644
--- a/ui/wm/core/cursor_manager.h
+++ b/ui/wm/core/cursor_manager.h
@@ -80,7 +80,7 @@ class WM_EXPORT CursorManager : public aura::client::CursorClient,
   // The cursor state to restore when the cursor is unlocked.
   scoped_ptr<internal::CursorState> state_on_unlock_;
 
-  ObserverList<aura::client::CursorClientObserver> observers_;
+  base::ObserverList<aura::client::CursorClientObserver> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(CursorManager);
 };
diff --git a/ui/wm/core/default_activation_client.h b/ui/wm/core/default_activation_client.h
index 726d886..b5511457 100644
--- a/ui/wm/core/default_activation_client.h
+++ b/ui/wm/core/default_activation_client.h
@@ -60,7 +60,7 @@ class WM_EXPORT DefaultActivationClient : public aura::client::ActivationClient,
   // The window which was active before the currently active one.
   aura::Window* last_active_;
 
-  ObserverList<aura::client::ActivationChangeObserver> observers_;
+  base::ObserverList<aura::client::ActivationChangeObserver> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(DefaultActivationClient);
 };
diff --git a/ui/wm/core/focus_controller.h b/ui/wm/core/focus_controller.h
index 43d3c608b..be04b49 100644
--- a/ui/wm/core/focus_controller.h
+++ b/ui/wm/core/focus_controller.h
@@ -107,8 +107,9 @@ class WM_EXPORT FocusController : public aura::client::ActivationClient,
 
   scoped_ptr<FocusRules> rules_;
 
-  ObserverList<aura::client::ActivationChangeObserver> activation_observers_;
-  ObserverList<aura::client::FocusChangeObserver> focus_observers_;
+  base::ObserverList<aura::client::ActivationChangeObserver>
+      activation_observers_;
+  base::ObserverList<aura::client::FocusChangeObserver> focus_observers_;
 
   ScopedObserver<aura::Window, aura::WindowObserver> observer_manager_;
 
diff --git a/ui/wm/core/transient_window_manager.h b/ui/wm/core/transient_window_manager.h
index 6a17d9f..3f84420 100644
--- a/ui/wm/core/transient_window_manager.h
+++ b/ui/wm/core/transient_window_manager.h
@@ -98,7 +98,7 @@ class WM_EXPORT TransientWindowManager : public aura::WindowObserver {
   bool show_on_parent_visible_;
   bool ignore_visibility_changed_event_;
 
-  ObserverList<TransientWindowObserver> observers_;
+  base::ObserverList<TransientWindowObserver> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(TransientWindowManager);
 };
diff --git a/win8/metro_driver/ime/input_source.cc b/win8/metro_driver/ime/input_source.cc
index c734ad2..17d36bf 100644
--- a/win8/metro_driver/ime/input_source.cc
+++ b/win8/metro_driver/ime/input_source.cc
@@ -126,7 +126,7 @@ class InputSourceImpl : public InputSource {
 
   base::win::ScopedComPtr<ITfInputProcessorProfileMgr> profile_manager_;
   scoped_refptr<InputSourceMonitor> monitor_;
-  ObserverList<InputSourceObserver> observer_list_;
+  base::ObserverList<InputSourceObserver> observer_list_;
 
   DISALLOW_COPY_AND_ASSIGN(InputSourceImpl);
 };