Move keyboard test from unit test to browser test

Temporarily move AshKeyboardControllerProxyTest from unit test to browser test.
There is a problem with calling ui::SetUpInputMethodFactoryForTesting() in unit
test right now. See comments in codereview.chromium.org/136033005 for detail.

BUG=NONE
R=oshima@chromium.org

Review URL: https://codereview.chromium.org/139293009

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@245249 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/ui/ash/ash_keyboard_controller_proxy_unittest.cc → chrome/browser/ui/ash/ash_keyboard_controller_proxy_browsertest.cc

@@ -67,6 +67,8 @@ class TestAshKeyboardControllerProxy : public AshKeyboardControllerProxy {
   DISALLOW_COPY_AND_ASSIGN(TestAshKeyboardControllerProxy);
 };
 
+// TODO(bshe): Move this test back to unit test if
+// ui::SetUpInputMethodFactoryForTesting() is safe to be called in unit test.
 class AshKeyboardControllerProxyTest : public ash::test::AshTestBase {
  public:
   AshKeyboardControllerProxyTest() {}

chrome/chrome_tests.gypi

@@ -948,6 +948,10 @@
         '../components/autofill/content/renderer/password_form_conversion_utils_browsertest.cc',
         '../components/autofill/content/renderer/test_password_autofill_agent.h',
         '../components/autofill/content/renderer/test_password_autofill_agent.cc',
+        '../ui/compositor/test/layer_animator_test_controller.cc',
+        '../ui/compositor/test/layer_animator_test_controller.h',
+        '../ui/views/test/test_views_delegate.cc',
+        '../ui/views/test/test_views_delegate.h',
         'app/chrome_command_ids.h',
         'app/chrome_dll.rc',
         'app/chrome_dll_resource.h',
@@ -1389,6 +1393,7 @@
         'browser/ui/app_list/search/people/people_provider_browsertest.cc',
         'browser/ui/app_list/search/webstore/webstore_provider_browsertest.cc',
         'browser/ui/ash/accelerator_commands_browsertest.cc',
+        'browser/ui/ash/ash_keyboard_controller_proxy_browsertest.cc',
         'browser/ui/ash/caps_lock_delegate_chromeos_browsertest.cc',
         'browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc',
         'browser/ui/ash/launcher/launcher_favicon_loader_browsertest.cc',

chrome/chrome_tests_unit.gypi

@@ -550,8 +550,6 @@
         '../extensions/common/url_pattern_set_unittest.cc',
         '../extensions/common/url_pattern_unittest.cc',
         '../extensions/common/user_script_unittest.cc',
-        '../ui/compositor/test/layer_animator_test_controller.cc',
-        '../ui/compositor/test/layer_animator_test_controller.h',
         'app/chrome_dll.rc',
         # All unittests in browser, common, renderer and service.
         'browser/about_flags_unittest.cc',
@@ -1419,7 +1417,6 @@
         'browser/translate/translate_prefs_unittest.cc',
         'browser/translate/translate_script_unittest.cc',
         'browser/ui/android/tab_model/tab_model_unittest.cc',
-        'browser/ui/ash/ash_keyboard_controller_proxy_unittest.cc',
         'browser/ui/ash/event_rewriter_unittest.cc',
         'browser/ui/ash/ime_controller_chromeos_unittest.cc',
         'browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc',