| 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/process/process.h" | 6 #include "base/process/process.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/app/chrome_command_ids.h" | 9 #include "chrome/app/chrome_command_ids.h" |
| 10 #include "chrome/browser/apps/app_browsertest_util.h" | 10 #include "chrome/browser/apps/app_browsertest_util.h" |
| (...skipping 1110 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1121 NEEDS_TEST_SERVER); | 1121 NEEDS_TEST_SERVER); |
| 1122 } | 1122 } |
| 1123 | 1123 |
| 1124 IN_PROC_BROWSER_TEST_F( | 1124 IN_PROC_BROWSER_TEST_F( |
| 1125 WebViewTest, | 1125 WebViewTest, |
| 1126 Shim_TestContentScriptIsInjectedAfterTerminateAndReloadWebView) { | 1126 Shim_TestContentScriptIsInjectedAfterTerminateAndReloadWebView) { |
| 1127 TestHelper("testContentScriptIsInjectedAfterTerminateAndReloadWebView", | 1127 TestHelper("testContentScriptIsInjectedAfterTerminateAndReloadWebView", |
| 1128 "web_view/shim", NEEDS_TEST_SERVER); | 1128 "web_view/shim", NEEDS_TEST_SERVER); |
| 1129 } | 1129 } |
| 1130 | 1130 |
| 1131 IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestAddContentScriptWithCode) { |
| 1132 TestHelper("testAddContentScriptWithCode", "web_view/shim", |
| 1133 NEEDS_TEST_SERVER); |
| 1134 } |
| 1135 |
| 1131 IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestExecuteScriptFail) { | 1136 IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestExecuteScriptFail) { |
| 1132 #if defined(OS_WIN) | 1137 #if defined(OS_WIN) |
| 1133 // Flaky on XP bot http://crbug.com/266185 | 1138 // Flaky on XP bot http://crbug.com/266185 |
| 1134 if (base::win::GetVersion() <= base::win::VERSION_XP) | 1139 if (base::win::GetVersion() <= base::win::VERSION_XP) |
| 1135 return; | 1140 return; |
| 1136 #endif | 1141 #endif |
| 1137 | 1142 |
| 1138 TestHelper("testExecuteScriptFail", "web_view/shim", NEEDS_TEST_SERVER); | 1143 TestHelper("testExecuteScriptFail", "web_view/shim", NEEDS_TEST_SERVER); |
| 1139 } | 1144 } |
| 1140 | 1145 |
| (...skipping 1630 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2771 // http://crbug.com/403325 | 2776 // http://crbug.com/403325 |
| 2772 #define MAYBE_WebViewInBackgroundPage \ | 2777 #define MAYBE_WebViewInBackgroundPage \ |
| 2773 DISABLED_WebViewInBackgroundPage | 2778 DISABLED_WebViewInBackgroundPage |
| 2774 #else | 2779 #else |
| 2775 #define MAYBE_WebViewInBackgroundPage WebViewInBackgroundPage | 2780 #define MAYBE_WebViewInBackgroundPage WebViewInBackgroundPage |
| 2776 #endif | 2781 #endif |
| 2777 IN_PROC_BROWSER_TEST_F(WebViewTest, MAYBE_WebViewInBackgroundPage) { | 2782 IN_PROC_BROWSER_TEST_F(WebViewTest, MAYBE_WebViewInBackgroundPage) { |
| 2778 ASSERT_TRUE(RunExtensionTest("platform_apps/web_view/background")) | 2783 ASSERT_TRUE(RunExtensionTest("platform_apps/web_view/background")) |
| 2779 << message_; | 2784 << message_; |
| 2780 } | 2785 } |
| OLD | NEW |