| 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 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 67 installer->InstallCrx(path); | 67 installer->InstallCrx(path); |
| 68 // Wait for CRX to be installed. | 68 // Wait for CRX to be installed. |
| 69 observer.Wait(); | 69 observer.Wait(); |
| 70 std::string extensionId = installer->extension()->id(); | 70 std::string extensionId = installer->extension()->id(); |
| 71 if (!service->GetExtensionById(extensionId, false)) | 71 if (!service->GetExtensionById(extensionId, false)) |
| 72 return ""; | 72 return ""; |
| 73 return extensionId; | 73 return extensionId; |
| 74 } | 74 } |
| 75 }; | 75 }; |
| 76 | 76 |
| 77 IN_PROC_BROWSER_TEST_F(InputViewBrowserTest, TypingTest) { | 77 // Disabled for leaking memory: http://crbug.com/380537 |
| 78 IN_PROC_BROWSER_TEST_F(InputViewBrowserTest, DISABLED_TypingTest) { |
| 78 std::string id = InstallIMEExtension(); | 79 std::string id = InstallIMEExtension(); |
| 79 ASSERT_FALSE(id.empty()); | 80 ASSERT_FALSE(id.empty()); |
| 80 RunTest(base::FilePath("typing_test.js"), | 81 RunTest(base::FilePath("typing_test.js"), |
| 81 InputViewConfig(id, kDefaultLayout)); | 82 InputViewConfig(id, kDefaultLayout)); |
| 82 } | 83 } |
| 83 | 84 |
| 84 IN_PROC_BROWSER_TEST_F(InputViewBrowserTest, CompactTypingTest) { | 85 // Disabled for leaking memory: http://crbug.com/380537 |
| 86 IN_PROC_BROWSER_TEST_F(InputViewBrowserTest, DISABLED_CompactTypingTest) { |
| 85 std::string id = InstallIMEExtension(); | 87 std::string id = InstallIMEExtension(); |
| 86 ASSERT_FALSE(id.empty()); | 88 ASSERT_FALSE(id.empty()); |
| 87 RunTest(base::FilePath("typing_test.js"), | 89 RunTest(base::FilePath("typing_test.js"), |
| 88 InputViewConfig(id, kCompactLayout)); | 90 InputViewConfig(id, kCompactLayout)); |
| 89 } | 91 } |
| 90 | 92 |
| 91 IN_PROC_BROWSER_TEST_F(InputViewBrowserTest, KeysetTransitionTest) { | 93 // Disabled for leaking memory: http://crbug.com/380537 |
| 94 IN_PROC_BROWSER_TEST_F(InputViewBrowserTest, DISABLED_KeysetTransitionTest) { |
| 92 std::string id = InstallIMEExtension(); | 95 std::string id = InstallIMEExtension(); |
| 93 ASSERT_FALSE(id.empty()); | 96 ASSERT_FALSE(id.empty()); |
| 94 RunTest(base::FilePath("keyset_transition_test.js"), | 97 RunTest(base::FilePath("keyset_transition_test.js"), |
| 95 InputViewConfig(id, kDefaultLayout)); | 98 InputViewConfig(id, kDefaultLayout)); |
| 96 } | 99 } |
| 97 | 100 |
| 98 IN_PROC_BROWSER_TEST_F(InputViewBrowserTest, CompactKeysetTransitionTest) { | 101 // Disabled for leaking memory: http://crbug.com/380537 |
| 102 IN_PROC_BROWSER_TEST_F(InputViewBrowserTest, |
| 103 DISABLED_CompactKeysetTransitionTest) { |
| 99 std::string id = InstallIMEExtension(); | 104 std::string id = InstallIMEExtension(); |
| 100 ASSERT_FALSE(id.empty()); | 105 ASSERT_FALSE(id.empty()); |
| 101 RunTest(base::FilePath("keyset_transition_test.js"), | 106 RunTest(base::FilePath("keyset_transition_test.js"), |
| 102 InputViewConfig(id, kCompactLayout)); | 107 InputViewConfig(id, kCompactLayout)); |
| 103 } | 108 } |
| OLD | NEW |