Replace more ObserverList with base::ObserverList.

ui/wm/core/focus_controller.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef UI_WM_CORE_FOCUS_CONTROLLER_H_
 #define UI_WM_CORE_FOCUS_CONTROLLER_H_
 
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/observer_list.h"
@@ skipping 89 matching lines @@
   void WindowFocusedFromInputEvent(aura::Window* window);
 
   aura::Window* active_window_;
   aura::Window* focused_window_;
 
   bool updating_focus_;
   bool updating_activation_;
 
   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_;
 
   DISALLOW_COPY_AND_ASSIGN(FocusController);
 };
 
 }  // namespace wm
 
 #endif  // UI_WM_CORE_FOCUS_CONTROLLER_H_