Rework FocusManager as FocusClient.

ui/aura/bench/bench_main.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 "base/at_exit.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/i18n/icu_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
@@ skipping 290 matching lines @@
   aura::Env::GetInstance();
   aura::SetUseFullscreenHostWindow(true);
   aura::TestScreen test_screen;
   gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, &test_screen);
   scoped_ptr<aura::RootWindow> root_window(
       test_screen.CreateRootWindowForPrimaryDisplay());
   aura::client::SetCaptureClient(
       root_window.get(),
       new aura::client::DefaultCaptureClient(root_window.get()));
 
-  scoped_ptr<aura::FocusManager> focus_manager(new aura::FocusManager);
-  root_window->set_focus_manager(focus_manager.get());
+  scoped_ptr<aura::client::FocusClient> focus_client(new aura::FocusManager);
+  aura::client::SetFocusClient(root_window.get(), focus_client.get());
 
   // add layers
   ColoredLayer background(SK_ColorRED);
   background.SetBounds(root_window->bounds());
   root_window->layer()->Add(&background);
 
   ColoredLayer window(SK_ColorBLUE);
   window.SetBounds(gfx::Rect(background.bounds().size()));
   background.Add(&window);
 
@@ skipping 23 matching lines @@
                                root_window->compositor(),
                                frames));
   }
 
 #ifndef NDEBUG
   ui::PrintLayerHierarchy(root_window->layer(), gfx::Point(100, 100));
 #endif
 
   root_window->ShowRootWindow();
   MessageLoopForUI::current()->Run();
-  focus_manager.reset();
+  focus_client.reset();
   root_window.reset();
 
   ui::CompositorTestSupport::Terminate();
 
   return 0;
 }