| Index: chrome/browser/chromeos/extensions/virtual_keyboard_browsertest.cc
|
| diff --git a/chrome/browser/chromeos/extensions/virtual_keyboard_browsertest.cc b/chrome/browser/chromeos/extensions/virtual_keyboard_browsertest.cc
|
| index afe7c0ef5c7d4d82b15c9a95a365578405de8703..222fcfdc31958883ccb02a352b85138b29249cc6 100644
|
| --- a/chrome/browser/chromeos/extensions/virtual_keyboard_browsertest.cc
|
| +++ b/chrome/browser/chromeos/extensions/virtual_keyboard_browsertest.cc
|
| @@ -140,7 +140,13 @@ IN_PROC_BROWSER_TEST_F(VirtualKeyboardBrowserTest, KeysetTransitionTest) {
|
| RunTest(base::FilePath(FILE_PATH_LITERAL("keyset_transition_test.js")));
|
| }
|
|
|
| -IN_PROC_BROWSER_TEST_F(VirtualKeyboardBrowserTest, IsKeyboardLoaded) {
|
| +// Fails when enabling Object.observe. See http://crbug.com/370004
|
| +#if defined(OS_CHROMEOS)
|
| +#define MAYBE_IsKeyboardLoaded DISABLED_IsKeyboardLoaded
|
| +#else
|
| +#define MAYBE_IsKeyboardLoaded IsKeyboardLoaded
|
| +#endif
|
| +IN_PROC_BROWSER_TEST_F(VirtualKeyboardBrowserTest, MAYBE_IsKeyboardLoaded) {
|
| content::RenderViewHost* keyboard_rvh = GetKeyboardRenderViewHost();
|
| ASSERT_TRUE(keyboard_rvh);
|
| bool loaded = false;
|
|
|