Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(90)

Side by Side Diff: chrome/browser/apps/guest_view/web_view_browsertest.cc

Issue 1058113002: Implement <webview>.addContentScript/removeContentScript API [3] (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@webui_api_1
Patch Set: nits. Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | chrome/browser/ui/webui/webui_webview_browsertest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 1135 matching lines...) Expand 10 before | Expand all | Expand 10 after
1146 TestHelper("testContentScriptIsInjectedAfterTerminateAndReloadWebView", 1146 TestHelper("testContentScriptIsInjectedAfterTerminateAndReloadWebView",
1147 "web_view/shim", NEEDS_TEST_SERVER); 1147 "web_view/shim", NEEDS_TEST_SERVER);
1148 } 1148 }
1149 1149
1150 IN_PROC_BROWSER_TEST_F(WebViewTest, 1150 IN_PROC_BROWSER_TEST_F(WebViewTest,
1151 Shim_TestContentScriptExistsAsLongAsWebViewTagExists) { 1151 Shim_TestContentScriptExistsAsLongAsWebViewTagExists) {
1152 TestHelper("testContentScriptExistsAsLongAsWebViewTagExists", "web_view/shim", 1152 TestHelper("testContentScriptExistsAsLongAsWebViewTagExists", "web_view/shim",
1153 NEEDS_TEST_SERVER); 1153 NEEDS_TEST_SERVER);
1154 } 1154 }
1155 1155
1156 IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestAddContentScriptWithCode) {
1157 TestHelper("testAddContentScriptWithCode", "web_view/shim",
1158 NEEDS_TEST_SERVER);
1159 }
1160
1156 IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestExecuteScriptFail) { 1161 IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestExecuteScriptFail) {
1157 #if defined(OS_WIN) 1162 #if defined(OS_WIN)
1158 // Flaky on XP bot http://crbug.com/266185 1163 // Flaky on XP bot http://crbug.com/266185
1159 if (base::win::GetVersion() <= base::win::VERSION_XP) 1164 if (base::win::GetVersion() <= base::win::VERSION_XP)
1160 return; 1165 return;
1161 #endif 1166 #endif
1162 1167
1163 TestHelper("testExecuteScriptFail", "web_view/shim", NEEDS_TEST_SERVER); 1168 TestHelper("testExecuteScriptFail", "web_view/shim", NEEDS_TEST_SERVER);
1164 } 1169 }
1165 1170
(...skipping 1629 matching lines...) Expand 10 before | Expand all | Expand 10 after
2795 IN_PROC_BROWSER_TEST_F(WebViewTest, AllowTransparencyAndAllowScalingPropagate) { 2800 IN_PROC_BROWSER_TEST_F(WebViewTest, AllowTransparencyAndAllowScalingPropagate) {
2796 LoadAppWithGuest("web_view/simple"); 2801 LoadAppWithGuest("web_view/simple");
2797 2802
2798 ASSERT_TRUE(!!GetGuestWebContents()); 2803 ASSERT_TRUE(!!GetGuestWebContents());
2799 extensions::WebViewGuest* guest = 2804 extensions::WebViewGuest* guest =
2800 extensions::WebViewGuest::FromWebContents(GetGuestWebContents()); 2805 extensions::WebViewGuest::FromWebContents(GetGuestWebContents());
2801 ASSERT_TRUE(guest->allow_transparency()); 2806 ASSERT_TRUE(guest->allow_transparency());
2802 ASSERT_TRUE(guest->allow_scaling()); 2807 ASSERT_TRUE(guest->allow_scaling());
2803 } 2808 }
2804 2809
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/webui/webui_webview_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698