Introduce AndroidFocusRules and NativeWidgetAndroid

ui/wm/test/wm_test_helper.cc

 // Copyright 2013 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/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/core/compound_event_filter.h"
 #include "ui/wm/core/default_activation_client.h"
 
+#if defined(OS_ANDROID)
+#include "ui/wm/android/android_focus_rules.h"
+#include "ui/wm/core/base_focus_rules.h"
+#include "ui/wm/core/focus_controller.h"
+#else
+#include "ui/aura/test/test_focus_client.h"
+#endif
+
 namespace wm {
 
 WMTestHelper::WMTestHelper(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);
 
+#if defined(OS_ANDROID)
+  AndroidFocusRules* focus_rules = new AndroidFocusRules();
+  focus_client_.reset(new FocusController(focus_rules));
+#else
   focus_client_.reset(new aura::test::TestFocusClient);
+#endif

[sadrul, 2015/10/19 15:36:11]

Is there a reason to want to use the FocusController with platform-specific
focus-rules in tests only on android, but not on other platforms?

[bshe, 2015/11/03 19:40:39]

My understanding is that we might use this test helper in aura clank so it will
be no longer only for test. For other platforms, keep it untouched seems safer?

   aura::client::SetFocusClient(host_->window(), focus_client_.get());
 
   root_window_event_filter_.reset(new wm::CompoundEventFilter);
   host_->window()->AddPreTargetHandler(root_window_event_filter_.get());
 
   new wm::DefaultActivationClient(host_->window());
 
   capture_client_.reset(
       new aura::client::DefaultCaptureClient(host_->window()));
 }
 
 WMTestHelper::~WMTestHelper() {
 }
 
 aura::Window* WMTestHelper::GetDefaultParent(aura::Window* context,
                                              aura::Window* window,
                                              const gfx::Rect& bounds) {
   return host_->window();
 }
 
 }  // namespace wm