Introduce AndroidFocusRules and NativeWidgetAndroid

ui/wm/android/window_tree_host_manager.cc

Index: ui/wm/android/window_tree_host_manager.cc
diff --git a/ui/wm/test/wm_test_helper.cc b/ui/wm/android/window_tree_host_manager.cc
similarity index 55%
copy from ui/wm/test/wm_test_helper.cc
copy to ui/wm/android/window_tree_host_manager.cc
index 83166be9aad299bf55f6cd06a027acfae24242e0..942997c2536700a8474093b9845d39f84c5c4985 100644
--- a/ui/wm/test/wm_test_helper.cc
+++ b/ui/wm/android/window_tree_host_manager.cc
@@ -1,27 +1,31 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
+// Copyright 2015 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 "ui/wm/test/wm_test_helper.h"
+#include "ui/wm/android/window_tree_host_manager.h"
 
 #include "ui/aura/client/default_capture_client.h"
 #include "ui/aura/env.h"
-#include "ui/aura/test/test_focus_client.h"
 #include "ui/aura/window.h"
+#include "ui/wm/android/android_focus_rules.h"
+#include "ui/wm/core/base_focus_rules.h"
 #include "ui/wm/core/compound_event_filter.h"
 #include "ui/wm/core/default_activation_client.h"
+#include "ui/wm/core/focus_controller.h"
 
 namespace wm {
 
-WMTestHelper::WMTestHelper(const gfx::Size& default_window_size,
-                           ui::ContextFactory* context_factory) {
+WindowTreeHostManager::WindowTreeHostManager(
+    const gfx::Size& default_window_size,
+    ui::ContextFactory* context_factory) {
   aura::Env::CreateInstance(true);
   aura::Env::GetInstance()->set_context_factory(context_factory);
   host_.reset(aura::WindowTreeHost::Create(gfx::Rect(default_window_size)));
   host_->InitHost();
   aura::client::SetWindowTreeClient(host_->window(), this);
 
-  focus_client_.reset(new aura::test::TestFocusClient);
+  AndroidFocusRules* focus_rules = new AndroidFocusRules();
+  focus_client_.reset(new FocusController(focus_rules));
   aura::client::SetFocusClient(host_->window(), focus_client_.get());
 
   root_window_event_filter_.reset(new wm::CompoundEventFilter);
@@ -33,12 +37,11 @@ WMTestHelper::WMTestHelper(const gfx::Size& default_window_size,
       new aura::client::DefaultCaptureClient(host_->window()));
 }
 
-WMTestHelper::~WMTestHelper() {
-}
+WindowTreeHostManager::~WindowTreeHostManager() {}
 
-aura::Window* WMTestHelper::GetDefaultParent(aura::Window* context,
-                                             aura::Window* window,
-                                             const gfx::Rect& bounds) {
+aura::Window* WindowTreeHostManager::GetDefaultParent(aura::Window* context,
+                                                      aura::Window* window,
+                                                      const gfx::Rect& bounds) {
   return host_->window();
 }