Rework FocusManager as FocusClient.

ui/views/focus/focus_manager_unittest.cc

 // 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.
 
 #include <utility>
 #include <vector>
 
 #include "base/utf_string_conversions.h"
 #include "ui/base/accelerators/accelerator.h"
 #include "ui/base/keycodes/keyboard_codes.h"
 #include "ui/views/controls/button/text_button.h"
 #include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/focus/accelerator_handler.h"
 #include "ui/views/focus/focus_manager_factory.h"
 #include "ui/views/focus/focus_manager_test.h"
 #include "ui/views/focus/widget_focus_manager.h"
 #include "ui/views/widget/widget.h"
 
 #if defined(USE_AURA)
-#include "ui/aura/focus_manager.h"
+#include "ui/aura/client/focus_client.h"
 #include "ui/aura/window.h"
 #else
 #include "ui/views/controls/tabbed_pane/native_tabbed_pane_wrapper.h"
 #include "ui/views/controls/tabbed_pane/tabbed_pane.h"
 #endif
 
 namespace views {
 
 void FocusNativeView(gfx::NativeView view) {
 #if defined(USE_AURA)
-  view->GetFocusManager()->SetFocusedWindow(view, NULL);
+  aura::client::GetFocusClient(view)->FocusWindow(view, NULL);
 #elif defined(OS_WIN)
   SetFocus(view);
 #else
 #error
 #endif
 }
 
 enum FocusTestEventType {
   ON_FOCUS = 0,
   ON_BLUR
@@ skipping 655 matching lines @@
   views::View* v3 = new View;
   v3->set_focusable(true);
   GetContentsView()->AddChildView(v3);
 
   v3->RequestFocus();
   GetWidget()->GetFocusManager()->AdvanceFocus(true);
   EXPECT_TRUE(v1->HasFocus());
 }
 
 }  // namespace views