Rework FocusManager as FocusClient.

ui/aura/test/aura_test_helper.h

Index: ui/aura/test/aura_test_helper.h
===================================================================
--- ui/aura/test/aura_test_helper.h	(revision 169793)
+++ ui/aura/test/aura_test_helper.h	(working copy)
@@ -15,11 +15,11 @@
 }
 
 namespace aura {
-class FocusManager;
 class RootWindow;
 class TestScreen;
 namespace client {
 class DefaultCaptureClient;
+class FocusClient;
 }
 namespace test {
 class TestActivationClient;
@@ -36,8 +36,8 @@
   // Creates and initializes (shows and sizes) the RootWindow for use in tests.
   void SetUp();
 
-  // Clean up objects that are created for tests. This also delete
-  // aura::Env object.
+  // Clean up objects that are created for tests. This also deletes the Env
+  // object.
   void TearDown();
 
   // Flushes message loop.
@@ -55,8 +55,8 @@
   scoped_ptr<TestActivationClient> test_activation_client_;
   scoped_ptr<client::DefaultCaptureClient> capture_client_;
   scoped_ptr<ui::InputMethod> test_input_method_;
-  scoped_ptr<FocusManager> focus_manager_;
-  scoped_ptr<aura::TestScreen> test_screen_;
+  scoped_ptr<client::FocusClient> focus_client_;
+  scoped_ptr<TestScreen> test_screen_;
 
   DISALLOW_COPY_AND_ASSIGN(AuraTestHelper);
 };