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}

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);
 };

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);
 };

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.

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_;

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.

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);
 };

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);
 };

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);
 };

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);
 };

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

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);
 };

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).

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_;

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);
 };

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_;

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);

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);
 };

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.
 

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);
 };

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_;

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_;

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()

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_;
 

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

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) {
 }
 

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_;
 

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);
 };

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_;

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_;

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.

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_;
 

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.

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.

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.

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.

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.

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.

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.

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.

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_;
 

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_;
 

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.

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_;

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;

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.

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.

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.

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);
 };

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);
 };

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);
 };

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);
 };

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_;

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_;

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_;

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_;

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_;

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_;

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_;
 

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_;

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_;

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_;
 

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);
 };

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.

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

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.

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

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

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_;

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_;
 

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_;
 

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_;
 

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_;
 

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_;
 

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_;

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_;
 

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_;

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

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.

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>

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);
 };

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_;

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_;

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_;

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_;

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_;
 

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.

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.

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_;

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_);

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.

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

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);
 };

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);
 };

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);
 };

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_;
 

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_;
 

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_;
 

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);

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_;

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);
 };