| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "ash/shell.h" | 5 #include "ash/shell.h" |
| 6 #include "base/files/file_path.h" | 6 #include "base/files/file_path.h" |
| 7 #include "chrome/browser/chromeos/extensions/virtual_keyboard_browsertest.h" | 7 #include "chrome/browser/chromeos/extensions/virtual_keyboard_browsertest.h" |
| 8 #include "chrome/browser/extensions/crx_installer.h" | 8 #include "chrome/browser/extensions/crx_installer.h" |
| 9 #include "chrome/browser/extensions/extension_service.h" | 9 #include "chrome/browser/extensions/extension_service.h" |
| 10 #include "chrome/browser/extensions/extension_test_notification_observer.h" | 10 #include "chrome/browser/extensions/extension_test_notification_observer.h" |
| (...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 70 installer->InstallCrx(path); | 70 installer->InstallCrx(path); |
| 71 // Wait for CRX to be installed. | 71 // Wait for CRX to be installed. |
| 72 observer.Wait(); | 72 observer.Wait(); |
| 73 std::string extensionId = installer->extension()->id(); | 73 std::string extensionId = installer->extension()->id(); |
| 74 if (!service->GetExtensionById(extensionId, false)) | 74 if (!service->GetExtensionById(extensionId, false)) |
| 75 return ""; | 75 return ""; |
| 76 return extensionId; | 76 return extensionId; |
| 77 } | 77 } |
| 78 }; | 78 }; |
| 79 | 79 |
| 80 IN_PROC_BROWSER_TEST_F(InputViewBrowserTest, TypingTest) { | 80 // Disabled for flaking. See crbug.com/459420. |
| 81 IN_PROC_BROWSER_TEST_F(InputViewBrowserTest, DISABLED_TypingTest) { |
| 81 std::string id = InstallIMEExtension(); | 82 std::string id = InstallIMEExtension(); |
| 82 ASSERT_FALSE(id.empty()); | 83 ASSERT_FALSE(id.empty()); |
| 83 RunTest(base::FilePath("typing_test.js"), | 84 RunTest(base::FilePath("typing_test.js"), |
| 84 InputViewConfig(id, kDefaultLayout)); | 85 InputViewConfig(id, kDefaultLayout)); |
| 85 } | 86 } |
| 86 | 87 |
| 87 IN_PROC_BROWSER_TEST_F(InputViewBrowserTest, CompactTypingTest) { | 88 // Disabled for flaking. See crbug.com/459420. |
| 89 IN_PROC_BROWSER_TEST_F(InputViewBrowserTest, DISABLED_CompactTypingTest) { |
| 88 std::string id = InstallIMEExtension(); | 90 std::string id = InstallIMEExtension(); |
| 89 ASSERT_FALSE(id.empty()); | 91 ASSERT_FALSE(id.empty()); |
| 90 RunTest(base::FilePath("typing_test.js"), | 92 RunTest(base::FilePath("typing_test.js"), |
| 91 InputViewConfig(id, kCompactLayout)); | 93 InputViewConfig(id, kCompactLayout)); |
| 92 } | 94 } |
| 93 | 95 |
| 94 IN_PROC_BROWSER_TEST_F(InputViewBrowserTest, CompactLongpressTest) { | 96 // Disabled for flaking. See crbug.com/459420. |
| 97 IN_PROC_BROWSER_TEST_F(InputViewBrowserTest, DISABLED_CompactLongpressTest) { |
| 95 std::string id = InstallIMEExtension(); | 98 std::string id = InstallIMEExtension(); |
| 96 ASSERT_FALSE(id.empty()); | 99 ASSERT_FALSE(id.empty()); |
| 97 RunTest(base::FilePath("longpress_test.js"), | 100 RunTest(base::FilePath("longpress_test.js"), |
| 98 InputViewConfig(id, kCompactLayout)); | 101 InputViewConfig(id, kCompactLayout)); |
| 99 } | 102 } |
| 100 | 103 |
| 101 // Disabled for leaking memory: http://crbug.com/380537 | 104 // Disabled for leaking memory: http://crbug.com/380537 |
| 102 IN_PROC_BROWSER_TEST_F(InputViewBrowserTest, DISABLED_KeysetTransitionTest) { | 105 IN_PROC_BROWSER_TEST_F(InputViewBrowserTest, DISABLED_KeysetTransitionTest) { |
| 103 std::string id = InstallIMEExtension(); | 106 std::string id = InstallIMEExtension(); |
| 104 ASSERT_FALSE(id.empty()); | 107 ASSERT_FALSE(id.empty()); |
| 105 RunTest(base::FilePath("keyset_transition_test.js"), | 108 RunTest(base::FilePath("keyset_transition_test.js"), |
| 106 InputViewConfig(id, kDefaultLayout)); | 109 InputViewConfig(id, kDefaultLayout)); |
| 107 } | 110 } |
| 108 | 111 |
| 109 // Disabled for leaking memory: http://crbug.com/380537 | 112 // Disabled for leaking memory: http://crbug.com/380537 |
| 110 IN_PROC_BROWSER_TEST_F(InputViewBrowserTest, | 113 IN_PROC_BROWSER_TEST_F(InputViewBrowserTest, |
| 111 DISABLED_CompactKeysetTransitionTest) { | 114 DISABLED_CompactKeysetTransitionTest) { |
| 112 std::string id = InstallIMEExtension(); | 115 std::string id = InstallIMEExtension(); |
| 113 ASSERT_FALSE(id.empty()); | 116 ASSERT_FALSE(id.empty()); |
| 114 RunTest(base::FilePath("keyset_transition_test.js"), | 117 RunTest(base::FilePath("keyset_transition_test.js"), |
| 115 InputViewConfig(id, kCompactLayout)); | 118 InputViewConfig(id, kCompactLayout)); |
| 116 } | 119 } |
| OLD | NEW |