Change destruction order of FocusController

ui/views/widget/desktop_aura/desktop_native_widget_aura.h

Index: ui/views/widget/desktop_aura/desktop_native_widget_aura.h
diff --git a/ui/views/widget/desktop_aura/desktop_native_widget_aura.h b/ui/views/widget/desktop_aura/desktop_native_widget_aura.h
index 1f253032aa69fe70a17ea23d8e382e8ee3b176eb..64a1fe736e3a0037eca5a81be814f3d15b3781a0 100644
--- a/ui/views/widget/desktop_aura/desktop_native_widget_aura.h
+++ b/ui/views/widget/desktop_aura/desktop_native_widget_aura.h
@@ -31,6 +31,7 @@ namespace views {
 namespace corewm {
 class CompoundEventFilter;
 class CursorManager;
+class FocusController;
 class InputMethodEventFilter;
 class ShadowController;
 class TooltipController;
@@ -268,7 +269,7 @@ class VIEWS_EXPORT DesktopNativeWidgetAura
 
   internal::NativeWidgetDelegate* native_widget_delegate_;
 
-  scoped_ptr<aura::client::FocusClient> focus_client_;
+  scoped_ptr<corewm::FocusController> focus_client_;
   scoped_ptr<DesktopDispatcherClient> dispatcher_client_;
   scoped_ptr<aura::client::ScreenPositionClient> position_client_;
   scoped_ptr<aura::client::DragDropClient> drag_drop_client_;