Update from https://crrev.com/333737

services/window_manager/focus_controller.h

 // Copyright 2014 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 SERVICES_WINDOW_MANAGER_FOCUS_CONTROLLER_H_
 #define SERVICES_WINDOW_MANAGER_FOCUS_CONTROLLER_H_
 
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/observer_list.h"
@@ skipping 68 matching lines @@
   void ViewFocusedFromInputEvent(mojo::View* view);
 
   mojo::View* active_view_;
   mojo::View* focused_view_;
 
   bool updating_focus_;
   bool updating_activation_;
 
   scoped_ptr<FocusRules> rules_;
 
-  ObserverList<FocusControllerObserver> focus_controller_observers_;
+  base::ObserverList<FocusControllerObserver> focus_controller_observers_;
 
   ScopedObserver<mojo::View, ViewObserver> observer_manager_;
 
   DISALLOW_COPY_AND_ASSIGN(FocusController);
 };
 
 // Sets/Gets the focus controller for a view.
 void SetFocusController(mojo::View* view, FocusController* focus_controller);
 FocusController* GetFocusController(mojo::View* view);
 
 }  // namespace window_manager
 
 #endif  // SERVICES_WINDOW_MANAGER_FOCUS_CONTROLLER_H_