Rework FocusManager as FocusClient.

ui/views/widget/native_widget_aura.cc

Index: ui/views/widget/native_widget_aura.cc
===================================================================
--- ui/views/widget/native_widget_aura.cc	(revision 169818)
+++ ui/views/widget/native_widget_aura.cc	(working copy)
@@ -581,9 +581,9 @@
 }
 
 void NativeWidgetAura::ClearNativeFocus() {
-  if (window_ && window_->GetFocusManager() &&
-      window_->Contains(window_->GetFocusManager()->GetFocusedWindow()))
-    window_->GetFocusManager()->SetFocusedWindow(window_, NULL);
+  aura::client::FocusClient* client = aura::client::GetFocusClient(window_);
+  if (window_ && client && window_->Contains(client->GetFocusedWindow()))
+    client->FocusWindow(window_, NULL);
 }
 
 gfx::Rect NativeWidgetAura::GetWorkAreaBoundsInScreen() const {
@@ -680,7 +680,8 @@
   else
     DCHECK_EQ(ownership_, Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET);
 
-  delegate_->OnNativeBlur(window_->GetFocusManager()->GetFocusedWindow());
+  delegate_->OnNativeBlur(
+      aura::client::GetFocusClient(window_)->GetFocusedWindow());
 }
 
 gfx::NativeCursor NativeWidgetAura::GetCursor(const gfx::Point& point) {