Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(463)

Side by Side Diff: chrome/browser/chromeos/extensions/virtual_keyboard_browsertest.cc

Issue 260903024: Temporarily disable VirtualKeyboardBrowserTest.IsKeyboardLoaded to land the V8 roll. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add bug number Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "ash/shell.h" 9 #include "ash/shell.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
133 } 133 }
134 134
135 IN_PROC_BROWSER_TEST_F(VirtualKeyboardBrowserTest, HideKeyboardKeyTest) { 135 IN_PROC_BROWSER_TEST_F(VirtualKeyboardBrowserTest, HideKeyboardKeyTest) {
136 RunTest(base::FilePath(FILE_PATH_LITERAL("hide_keyboard_key_test.js"))); 136 RunTest(base::FilePath(FILE_PATH_LITERAL("hide_keyboard_key_test.js")));
137 } 137 }
138 138
139 IN_PROC_BROWSER_TEST_F(VirtualKeyboardBrowserTest, KeysetTransitionTest) { 139 IN_PROC_BROWSER_TEST_F(VirtualKeyboardBrowserTest, KeysetTransitionTest) {
140 RunTest(base::FilePath(FILE_PATH_LITERAL("keyset_transition_test.js"))); 140 RunTest(base::FilePath(FILE_PATH_LITERAL("keyset_transition_test.js")));
141 } 141 }
142 142
143 IN_PROC_BROWSER_TEST_F(VirtualKeyboardBrowserTest, IsKeyboardLoaded) { 143 // Fails when enabling Object.observe. See http://crbug.com/370004
144 #if defined(OS_CHROMEOS)
145 #define MAYBE_IsKeyboardLoaded DISABLED_IsKeyboardLoaded
146 #else
147 #define MAYBE_IsKeyboardLoaded IsKeyboardLoaded
148 #endif
149 IN_PROC_BROWSER_TEST_F(VirtualKeyboardBrowserTest, MAYBE_IsKeyboardLoaded) {
144 content::RenderViewHost* keyboard_rvh = GetKeyboardRenderViewHost(); 150 content::RenderViewHost* keyboard_rvh = GetKeyboardRenderViewHost();
145 ASSERT_TRUE(keyboard_rvh); 151 ASSERT_TRUE(keyboard_rvh);
146 bool loaded = false; 152 bool loaded = false;
147 std::string script = "!!chrome.virtualKeyboardPrivate"; 153 std::string script = "!!chrome.virtualKeyboardPrivate";
148 EXPECT_TRUE(content::ExecuteScriptAndExtractBool( 154 EXPECT_TRUE(content::ExecuteScriptAndExtractBool(
149 keyboard_rvh, 155 keyboard_rvh,
150 "window.domAutomationController.send(" + script + ");", 156 "window.domAutomationController.send(" + script + ");",
151 &loaded)); 157 &loaded));
152 // Catches the regression in crbug.com/308653. 158 // Catches the regression in crbug.com/308653.
153 ASSERT_TRUE(loaded); 159 ASSERT_TRUE(loaded);
(...skipping 27 matching lines...) Expand all
181 bool success = false; 187 bool success = false;
182 EXPECT_TRUE(content::ExecuteScriptAndExtractBool( 188 EXPECT_TRUE(content::ExecuteScriptAndExtractBool(
183 browser_rvh, 189 browser_rvh,
184 "success ? verifyInput('a') : waitForInput('a');", 190 "success ? verifyInput('a') : waitForInput('a');",
185 &success)); 191 &success));
186 ASSERT_TRUE(success); 192 ASSERT_TRUE(success);
187 } 193 }
188 194
189 // TODO(kevers|rsadam|bshe): Add UI tests for remaining virtual keyboard 195 // TODO(kevers|rsadam|bshe): Add UI tests for remaining virtual keyboard
190 // functionality. 196 // functionality.
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698