| 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 1142 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1153 TestHelper("testContentScriptIsInjectedAfterTerminateAndReloadWebView", | 1153 TestHelper("testContentScriptIsInjectedAfterTerminateAndReloadWebView", |
| 1154 "web_view/shim", NEEDS_TEST_SERVER); | 1154 "web_view/shim", NEEDS_TEST_SERVER); |
| 1155 } | 1155 } |
| 1156 | 1156 |
| 1157 IN_PROC_BROWSER_TEST_F(WebViewTest, | 1157 IN_PROC_BROWSER_TEST_F(WebViewTest, |
| 1158 Shim_TestContentScriptExistsAsLongAsWebViewTagExists) { | 1158 Shim_TestContentScriptExistsAsLongAsWebViewTagExists) { |
| 1159 TestHelper("testContentScriptExistsAsLongAsWebViewTagExists", "web_view/shim", | 1159 TestHelper("testContentScriptExistsAsLongAsWebViewTagExists", "web_view/shim", |
| 1160 NEEDS_TEST_SERVER); | 1160 NEEDS_TEST_SERVER); |
| 1161 } | 1161 } |
| 1162 | 1162 |
| 1163 IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestAddContentScriptWithCode) { |
| 1164 TestHelper("testAddContentScriptWithCode", "web_view/shim", |
| 1165 NEEDS_TEST_SERVER); |
| 1166 } |
| 1167 |
| 1163 IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestExecuteScriptFail) { | 1168 IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestExecuteScriptFail) { |
| 1164 #if defined(OS_WIN) | 1169 #if defined(OS_WIN) |
| 1165 // Flaky on XP bot http://crbug.com/266185 | 1170 // Flaky on XP bot http://crbug.com/266185 |
| 1166 if (base::win::GetVersion() <= base::win::VERSION_XP) | 1171 if (base::win::GetVersion() <= base::win::VERSION_XP) |
| 1167 return; | 1172 return; |
| 1168 #endif | 1173 #endif |
| 1169 | 1174 |
| 1170 TestHelper("testExecuteScriptFail", "web_view/shim", NEEDS_TEST_SERVER); | 1175 TestHelper("testExecuteScriptFail", "web_view/shim", NEEDS_TEST_SERVER); |
| 1171 } | 1176 } |
| 1172 | 1177 |
| (...skipping 1639 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2812 IN_PROC_BROWSER_TEST_F(WebViewTest, AllowTransparencyAndAllowScalingPropagate) { | 2817 IN_PROC_BROWSER_TEST_F(WebViewTest, AllowTransparencyAndAllowScalingPropagate) { |
| 2813 LoadAppWithGuest("web_view/simple"); | 2818 LoadAppWithGuest("web_view/simple"); |
| 2814 | 2819 |
| 2815 ASSERT_TRUE(!!GetGuestWebContents()); | 2820 ASSERT_TRUE(!!GetGuestWebContents()); |
| 2816 extensions::WebViewGuest* guest = | 2821 extensions::WebViewGuest* guest = |
| 2817 extensions::WebViewGuest::FromWebContents(GetGuestWebContents()); | 2822 extensions::WebViewGuest::FromWebContents(GetGuestWebContents()); |
| 2818 ASSERT_TRUE(guest->allow_transparency()); | 2823 ASSERT_TRUE(guest->allow_transparency()); |
| 2819 ASSERT_TRUE(guest->allow_scaling()); | 2824 ASSERT_TRUE(guest->allow_scaling()); |
| 2820 } | 2825 } |
| 2821 | 2826 |
| OLD | NEW |