| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 "apps/ui/native_app_window.h" | 5 #include "apps/ui/native_app_window.h" |
| 6 #include "base/path_service.h" | 6 #include "base/path_service.h" |
| 7 #include "base/strings/stringprintf.h" | 7 #include "base/strings/stringprintf.h" |
| 8 #include "base/strings/utf_string_conversions.h" | 8 #include "base/strings/utf_string_conversions.h" |
| 9 #include "chrome/browser/apps/app_browsertest_util.h" | 9 #include "chrome/browser/apps/app_browsertest_util.h" |
| 10 #include "chrome/browser/automation/automation_util.h" | 10 #include "chrome/browser/automation/automation_util.h" |
| (...skipping 1827 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1838 } | 1838 } |
| 1839 | 1839 |
| 1840 IN_PROC_BROWSER_TEST_F(WebViewTest, Dialog_TestConfirmDialogDefaultCancel) { | 1840 IN_PROC_BROWSER_TEST_F(WebViewTest, Dialog_TestConfirmDialogDefaultCancel) { |
| 1841 TestHelper("testConfirmDialogDefaultCancel", | 1841 TestHelper("testConfirmDialogDefaultCancel", |
| 1842 "DoneDialogTest.PASSED", | 1842 "DoneDialogTest.PASSED", |
| 1843 "DoneDialogTest.FAILED", | 1843 "DoneDialogTest.FAILED", |
| 1844 "web_view/dialog"); | 1844 "web_view/dialog"); |
| 1845 } | 1845 } |
| 1846 | 1846 |
| 1847 // TODO(fsamuel): This test consistently times out when run in parallel with | 1847 // TODO(fsamuel): This test consistently times out when run in parallel with |
| 1848 // other tests, but consistently passes when retried http://crbug.com/314809 | 1848 // other tests, but consistently passes when retried. Disable for now. |
| 1849 IN_PROC_BROWSER_TEST_F(WebViewTest, Dialog_TestConfirmDialogDefaultGCCancel) { | 1849 // See http://crbug.com/314809 |
| 1850 IN_PROC_BROWSER_TEST_F(WebViewTest, |
| 1851 DISABLED_Dialog_TestConfirmDialogDefaultGCCancel) { |
| 1850 TestHelper("testConfirmDialogDefaultGCCancel", | 1852 TestHelper("testConfirmDialogDefaultGCCancel", |
| 1851 "DoneDialogTest.PASSED", | 1853 "DoneDialogTest.PASSED", |
| 1852 "DoneDialogTest.FAILED", | 1854 "DoneDialogTest.FAILED", |
| 1853 "web_view/dialog"); | 1855 "web_view/dialog"); |
| 1854 } | 1856 } |
| 1855 | 1857 |
| 1856 IN_PROC_BROWSER_TEST_F(WebViewTest, Dialog_TestPromptDialog) { | 1858 IN_PROC_BROWSER_TEST_F(WebViewTest, Dialog_TestPromptDialog) { |
| 1857 TestHelper("testPromptDialog", | 1859 TestHelper("testPromptDialog", |
| 1858 "DoneDialogTest.PASSED", | 1860 "DoneDialogTest.PASSED", |
| 1859 "DoneDialogTest.FAILED", | 1861 "DoneDialogTest.FAILED", |
| (...skipping 21 matching lines...) Expand all Loading... |
| 1881 } | 1883 } |
| 1882 }; | 1884 }; |
| 1883 | 1885 |
| 1884 IN_PROC_BROWSER_TEST_F(WebViewPluginTest, TestLoadPluginEvent) { | 1886 IN_PROC_BROWSER_TEST_F(WebViewPluginTest, TestLoadPluginEvent) { |
| 1885 TestHelper("testPluginLoadPermission", | 1887 TestHelper("testPluginLoadPermission", |
| 1886 "DoneShimTest.PASSED", | 1888 "DoneShimTest.PASSED", |
| 1887 "DoneShimTest.FAILED", | 1889 "DoneShimTest.FAILED", |
| 1888 "web_view/shim"); | 1890 "web_view/shim"); |
| 1889 } | 1891 } |
| 1890 #endif // defined(ENABLE_PLUGINS) | 1892 #endif // defined(ENABLE_PLUGINS) |
| OLD | NEW |