| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright 2013 The Chromium Authors. All rights reserved. | 2 * Copyright 2013 The Chromium Authors. All rights reserved. |
| 3 * Use of this source code is governed by a BSD-style license that can be | 3 * Use of this source code is governed by a BSD-style license that can be |
| 4 * found in the LICENSE file. | 4 * found in the LICENSE file. |
| 5 */ | 5 */ |
| 6 #include "chrome/browser/chromeos/extensions/virtual_keyboard_browsertest.h" | 6 #include "chrome/browser/chromeos/extensions/virtual_keyboard_browsertest.h" |
| 7 | 7 |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "ash/shell.h" | 10 #include "ash/shell.h" |
| (...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 136 IN_PROC_BROWSER_TEST_F(VirtualKeyboardBrowserTest, DISABLED_ControlKeysTest) { | 136 IN_PROC_BROWSER_TEST_F(VirtualKeyboardBrowserTest, DISABLED_ControlKeysTest) { |
| 137 RunTest(base::FilePath(FILE_PATH_LITERAL("control_keys_test.js")), | 137 RunTest(base::FilePath(FILE_PATH_LITERAL("control_keys_test.js")), |
| 138 VirtualKeyboardBrowserTestConfig()); | 138 VirtualKeyboardBrowserTestConfig()); |
| 139 } | 139 } |
| 140 | 140 |
| 141 IN_PROC_BROWSER_TEST_F(VirtualKeyboardBrowserTest, HideKeyboardKeyTest) { | 141 IN_PROC_BROWSER_TEST_F(VirtualKeyboardBrowserTest, HideKeyboardKeyTest) { |
| 142 RunTest(base::FilePath(FILE_PATH_LITERAL("hide_keyboard_key_test.js")), | 142 RunTest(base::FilePath(FILE_PATH_LITERAL("hide_keyboard_key_test.js")), |
| 143 VirtualKeyboardBrowserTestConfig()); | 143 VirtualKeyboardBrowserTestConfig()); |
| 144 } | 144 } |
| 145 | 145 |
| 146 IN_PROC_BROWSER_TEST_F(VirtualKeyboardBrowserTest, KeysetTransitionTest) { | 146 // http://crbug.com/396326 |
| 147 IN_PROC_BROWSER_TEST_F(VirtualKeyboardBrowserTest, |
| 148 DISABLED_KeysetTransitionTest) { |
| 147 RunTest(base::FilePath(FILE_PATH_LITERAL("keyset_transition_test.js")), | 149 RunTest(base::FilePath(FILE_PATH_LITERAL("keyset_transition_test.js")), |
| 148 VirtualKeyboardBrowserTestConfig()); | 150 VirtualKeyboardBrowserTestConfig()); |
| 149 } | 151 } |
| 150 | 152 |
| 151 // Fails when enabling Object.observe. See http://crbug.com/370004 | 153 // Fails when enabling Object.observe. See http://crbug.com/370004 |
| 152 #if defined(OS_CHROMEOS) | 154 #if defined(OS_CHROMEOS) |
| 153 #define MAYBE_IsKeyboardLoaded DISABLED_IsKeyboardLoaded | 155 #define MAYBE_IsKeyboardLoaded DISABLED_IsKeyboardLoaded |
| 154 #else | 156 #else |
| 155 #define MAYBE_IsKeyboardLoaded IsKeyboardLoaded | 157 #define MAYBE_IsKeyboardLoaded IsKeyboardLoaded |
| 156 #endif | 158 #endif |
| (...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 197 bool success = false; | 199 bool success = false; |
| 198 EXPECT_TRUE(content::ExecuteScriptAndExtractBool( | 200 EXPECT_TRUE(content::ExecuteScriptAndExtractBool( |
| 199 browser_rvh, | 201 browser_rvh, |
| 200 "success ? verifyInput('a') : waitForInput('a');", | 202 "success ? verifyInput('a') : waitForInput('a');", |
| 201 &success)); | 203 &success)); |
| 202 ASSERT_TRUE(success); | 204 ASSERT_TRUE(success); |
| 203 } | 205 } |
| 204 | 206 |
| 205 // TODO(kevers|rsadam|bshe): Add UI tests for remaining virtual keyboard | 207 // TODO(kevers|rsadam|bshe): Add UI tests for remaining virtual keyboard |
| 206 // functionality. | 208 // functionality. |
| OLD | NEW |