Rework FocusManager as FocusClient.

ash/wm/activation_controller_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 "ash/wm/activation_controller.h"
 
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/test_activation_delegate.h"
 #include "ash/wm/window_util.h"
 #include "ui/aura/client/aura_constants.h"
-#include "ui/aura/focus_manager.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/test/event_generator.h"
 #include "ui/aura/test/test_window_delegate.h"
 #include "ui/aura/test/test_windows.h"
 #include "ui/compositor/layer.h"
 
 #if defined(OS_WIN)
 // Windows headers define macros for these function names which screw with us.
 #if defined(CreateWindow)
 #undef CreateWindow
@@ skipping 487 matching lines @@
   scoped_ptr<aura::Window> w1(aura::test::CreateTestWindowWithDelegate(
     &wd, -1, gfx::Rect(50, 50, 50, 50), lock_container));
 
   lock_container->layer()->SetVisible(false);
   w1->Focus();
   EXPECT_TRUE(w1->HasFocus());
 }
 
 }  // namespace test
 }  // namespace ash