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

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

Issue 252323004: disable VirtualKeyboardTest.Attributes until Object.observe is re-enabled (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: wee 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 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
111 std::string library_content; 111 std::string library_content;
112 ASSERT_TRUE(base::ReadFileToString(path, &library_content)) 112 ASSERT_TRUE(base::ReadFileToString(path, &library_content))
113 << path.value(); 113 << path.value();
114 utf8_content_.append(library_content); 114 utf8_content_.append(library_content);
115 utf8_content_.append(";\n"); 115 utf8_content_.append(";\n");
116 } 116 }
117 117
118 std::string utf8_content_; 118 std::string utf8_content_;
119 }; 119 };
120 120
121 IN_PROC_BROWSER_TEST_F(VirtualKeyboardBrowserTest, AttributesTest) { 121 // crbug.com/367817. Either this feature or just the test are depending
122 // on the presense of Object.observe which is presently disabled by default.
123 IN_PROC_BROWSER_TEST_F(VirtualKeyboardBrowserTest, DISABLED_AttributesTest) {
122 RunTest(base::FilePath(FILE_PATH_LITERAL("attributes_test.js"))); 124 RunTest(base::FilePath(FILE_PATH_LITERAL("attributes_test.js")));
123 } 125 }
124 126
125 IN_PROC_BROWSER_TEST_F(VirtualKeyboardBrowserTest, TypingTest) { 127 IN_PROC_BROWSER_TEST_F(VirtualKeyboardBrowserTest, TypingTest) {
126 RunTest(base::FilePath(FILE_PATH_LITERAL("typing_test.js"))); 128 RunTest(base::FilePath(FILE_PATH_LITERAL("typing_test.js")));
127 } 129 }
128 130
129 IN_PROC_BROWSER_TEST_F(VirtualKeyboardBrowserTest, ControlKeysTest) { 131 IN_PROC_BROWSER_TEST_F(VirtualKeyboardBrowserTest, ControlKeysTest) {
130 RunTest(base::FilePath(FILE_PATH_LITERAL("control_keys_test.js"))); 132 RunTest(base::FilePath(FILE_PATH_LITERAL("control_keys_test.js")));
131 } 133 }
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
179 bool success = false; 181 bool success = false;
180 EXPECT_TRUE(content::ExecuteScriptAndExtractBool( 182 EXPECT_TRUE(content::ExecuteScriptAndExtractBool(
181 browser_rvh, 183 browser_rvh,
182 "success ? verifyInput('a') : waitForInput('a');", 184 "success ? verifyInput('a') : waitForInput('a');",
183 &success)); 185 &success));
184 ASSERT_TRUE(success); 186 ASSERT_TRUE(success);
185 } 187 }
186 188
187 // TODO(kevers|rsadam|bshe): Add UI tests for remaining virtual keyboard 189 // TODO(kevers|rsadam|bshe): Add UI tests for remaining virtual keyboard
188 // functionality. 190 // 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