| 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 "base/path_service.h" | 5 #include "base/path_service.h" |
| 6 #include "base/strings/stringprintf.h" | 6 #include "base/strings/stringprintf.h" |
| 7 #include "base/strings/utf_string_conversions.h" | 7 #include "base/strings/utf_string_conversions.h" |
| 8 #include "chrome/browser/apps/app_browsertest_util.h" | 8 #include "chrome/browser/apps/app_browsertest_util.h" |
| 9 #include "chrome/browser/chrome_content_browser_client.h" | 9 #include "chrome/browser/chrome_content_browser_client.h" |
| 10 #include "chrome/browser/extensions/extension_test_message_listener.h" | 10 #include "chrome/browser/extensions/extension_test_message_listener.h" |
| (...skipping 982 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 993 Shim_TestInlineScriptFromAccessibleResources) { | 993 Shim_TestInlineScriptFromAccessibleResources) { |
| 994 TestHelper("testInlineScriptFromAccessibleResources", | 994 TestHelper("testInlineScriptFromAccessibleResources", |
| 995 "web_view/shim", | 995 "web_view/shim", |
| 996 NO_TEST_SERVER); | 996 NO_TEST_SERVER); |
| 997 } | 997 } |
| 998 | 998 |
| 999 IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestInvalidChromeExtensionURL) { | 999 IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestInvalidChromeExtensionURL) { |
| 1000 TestHelper("testInvalidChromeExtensionURL", "web_view/shim", NO_TEST_SERVER); | 1000 TestHelper("testInvalidChromeExtensionURL", "web_view/shim", NO_TEST_SERVER); |
| 1001 } | 1001 } |
| 1002 | 1002 |
| 1003 IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestEventName) { | 1003 // Disable on Chrome OS, as it is flaking a lot. See: http://crbug.com/413618. |
| 1004 #if defined(OS_CHROMEOS) |
| 1005 #define MAYBE_Shim_TestEventName DISABLED_Shim_TestEventName |
| 1006 #else |
| 1007 #define MAYBE_Shim_TestEventName Shim_TestEventName |
| 1008 #endif |
| 1009 IN_PROC_BROWSER_TEST_F(WebViewTest, MAYBE_Shim_TestEventName) { |
| 1004 TestHelper("testEventName", "web_view/shim", NO_TEST_SERVER); | 1010 TestHelper("testEventName", "web_view/shim", NO_TEST_SERVER); |
| 1005 } | 1011 } |
| 1006 | 1012 |
| 1007 // WebViewTest.Shim_TestOnEventProperty is flaky, so disable it. | 1013 // WebViewTest.Shim_TestOnEventProperty is flaky, so disable it. |
| 1008 // http://crbug.com/359832. | 1014 // http://crbug.com/359832. |
| 1009 IN_PROC_BROWSER_TEST_F(WebViewTest, DISABLED_Shim_TestOnEventProperty) { | 1015 IN_PROC_BROWSER_TEST_F(WebViewTest, DISABLED_Shim_TestOnEventProperty) { |
| 1010 TestHelper("testOnEventProperties", "web_view/shim", NO_TEST_SERVER); | 1016 TestHelper("testOnEventProperties", "web_view/shim", NO_TEST_SERVER); |
| 1011 } | 1017 } |
| 1012 | 1018 |
| 1013 IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestLoadProgressEvent) { | 1019 IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestLoadProgressEvent) { |
| (...skipping 1320 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2334 // http://crbug.com/403325 | 2340 // http://crbug.com/403325 |
| 2335 #define MAYBE_WebViewInBackgroundPage \ | 2341 #define MAYBE_WebViewInBackgroundPage \ |
| 2336 DISABLED_WebViewInBackgroundPage | 2342 DISABLED_WebViewInBackgroundPage |
| 2337 #else | 2343 #else |
| 2338 #define MAYBE_WebViewInBackgroundPage WebViewInBackgroundPage | 2344 #define MAYBE_WebViewInBackgroundPage WebViewInBackgroundPage |
| 2339 #endif | 2345 #endif |
| 2340 IN_PROC_BROWSER_TEST_F(WebViewTest, MAYBE_WebViewInBackgroundPage) { | 2346 IN_PROC_BROWSER_TEST_F(WebViewTest, MAYBE_WebViewInBackgroundPage) { |
| 2341 ASSERT_TRUE(RunExtensionTest("platform_apps/web_view/background")) | 2347 ASSERT_TRUE(RunExtensionTest("platform_apps/web_view/background")) |
| 2342 << message_; | 2348 << message_; |
| 2343 } | 2349 } |
| OLD | NEW |