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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/extensions/extension_resource_request_policy_apitest.cc

Issue 11728003: Change ExecuteJavaScript* helper functions in browser_test_utils.{h,cc} (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Adding files for gpu_tests and NaCl browser tests. Created 7 years, 12 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/extensions/extension_nacl_browsertest.cc ('k') | chrome/browser/extensions/extension_startup_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/extension_resource_request_policy_apitest.cc
diff --git a/chrome/browser/extensions/extension_resource_request_policy_apitest.cc b/chrome/browser/extensions/extension_resource_request_policy_apitest.cc
index cb4c48148da3c47dd016fbb532163d8d5603e1e2..3c6340303e5414f2131df3658ec69d33eb9ef7fd 100644
--- a/chrome/browser/extensions/extension_resource_request_policy_apitest.cc
+++ b/chrome/browser/extensions/extension_resource_request_policy_apitest.cc
@@ -51,9 +51,10 @@ IN_PROC_BROWSER_TEST_F(ExtensionResourceRequestPolicyTest, OriginPrivileges) {
browser(), web_resource.ReplaceComponents(make_host_a_com));
std::string result;
ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString(
- chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"",
- L"window.domAutomationController.send(document.title)",
- &result));
+ chrome::GetActiveWebContents(browser())->GetRenderViewHost(),
+ "",
+ "window.domAutomationController.send(document.title)",
+ &result));
EXPECT_EQ(result, "Loaded");
// A web host that loads a non-existent extension.
@@ -63,9 +64,10 @@ IN_PROC_BROWSER_TEST_F(ExtensionResourceRequestPolicyTest, OriginPrivileges) {
"non_existent_extension.html"));
ui_test_utils::NavigateToURL(browser(), non_existent_extension);
ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString(
- chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"",
- L"window.domAutomationController.send(document.title)",
- &result));
+ chrome::GetActiveWebContents(browser())->GetRenderViewHost(),
+ "",
+ "window.domAutomationController.send(document.title)",
+ &result));
EXPECT_EQ(result, "Image failed to load");
// A data URL. Data URLs should always be able to load chrome-extension://
@@ -77,8 +79,9 @@ IN_PROC_BROWSER_TEST_F(ExtensionResourceRequestPolicyTest, OriginPrivileges) {
ui_test_utils::NavigateToURL(browser(),
GURL(std::string("data:text/html;charset=utf-8,") + file_source));
ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString(
- chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"",
- L"window.domAutomationController.send(document.title)",
+ chrome::GetActiveWebContents(browser())->GetRenderViewHost(),
+ "",
+ "window.domAutomationController.send(document.title)",
&result));
EXPECT_EQ(result, "Loaded");
@@ -93,8 +96,9 @@ IN_PROC_BROWSER_TEST_F(ExtensionResourceRequestPolicyTest, OriginPrivileges) {
browser(),
GURL("chrome-extension://pbkkcbgdkliohhfaeefcijaghglkahja/index.html"));
ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString(
- chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"",
- L"window.domAutomationController.send(document.title)",
+ chrome::GetActiveWebContents(browser())->GetRenderViewHost(),
+ "",
+ "window.domAutomationController.send(document.title)",
&result));
EXPECT_EQ(result, "Loaded");
}
@@ -157,9 +161,10 @@ IN_PROC_BROWSER_TEST_F(ExtensionResourceRequestPolicyTest,
"web_accessible/accessible_resource.html"));
ui_test_utils::NavigateToURL(browser(), accessible_resource);
ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString(
- chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"",
- L"window.domAutomationController.send(document.title)",
- &result));
+ chrome::GetActiveWebContents(browser())->GetRenderViewHost(),
+ "",
+ "window.domAutomationController.send(document.title)",
+ &result));
EXPECT_EQ("Loaded", result);
GURL xhr_accessible_resource(
@@ -169,9 +174,10 @@ IN_PROC_BROWSER_TEST_F(ExtensionResourceRequestPolicyTest,
ui_test_utils::NavigateToURL(
browser(), xhr_accessible_resource);
ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString(
- chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"",
- L"window.domAutomationController.send(document.title)",
- &result));
+ chrome::GetActiveWebContents(browser())->GetRenderViewHost(),
+ "",
+ "window.domAutomationController.send(document.title)",
+ &result));
EXPECT_EQ("XHR completed with status: 200", result);
GURL xhr_inaccessible_resource(
@@ -181,9 +187,10 @@ IN_PROC_BROWSER_TEST_F(ExtensionResourceRequestPolicyTest,
ui_test_utils::NavigateToURL(
browser(), xhr_inaccessible_resource);
ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString(
- chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"",
- L"window.domAutomationController.send(document.title)",
- &result));
+ chrome::GetActiveWebContents(browser())->GetRenderViewHost(),
+ "",
+ "window.domAutomationController.send(document.title)",
+ &result));
EXPECT_EQ("XHR failed to load resource", result);
GURL nonaccessible_resource(
@@ -192,9 +199,10 @@ IN_PROC_BROWSER_TEST_F(ExtensionResourceRequestPolicyTest,
"web_accessible/nonaccessible_resource.html"));
ui_test_utils::NavigateToURL(browser(), nonaccessible_resource);
ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString(
- chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"",
- L"window.domAutomationController.send(document.title)",
- &result));
+ chrome::GetActiveWebContents(browser())->GetRenderViewHost(),
+ "",
+ "window.domAutomationController.send(document.title)",
+ &result));
EXPECT_EQ("Image failed to load", result);
GURL nonexistent_resource(
@@ -203,9 +211,10 @@ IN_PROC_BROWSER_TEST_F(ExtensionResourceRequestPolicyTest,
"web_accessible/nonexistent_resource.html"));
ui_test_utils::NavigateToURL(browser(), nonexistent_resource);
ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString(
- chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"",
- L"window.domAutomationController.send(document.title)",
- &result));
+ chrome::GetActiveWebContents(browser())->GetRenderViewHost(),
+ "",
+ "window.domAutomationController.send(document.title)",
+ &result));
EXPECT_EQ("Image failed to load", result);
GURL nonaccessible_cer_resource(
@@ -214,9 +223,10 @@ IN_PROC_BROWSER_TEST_F(ExtensionResourceRequestPolicyTest,
"web_accessible/nonaccessible_chrome_resource_scheme.html"));
ui_test_utils::NavigateToURL(browser(), nonaccessible_cer_resource);
ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString(
- chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"",
- L"window.domAutomationController.send(document.title)",
- &result));
+ chrome::GetActiveWebContents(browser())->GetRenderViewHost(),
+ "",
+ "window.domAutomationController.send(document.title)",
+ &result));
EXPECT_EQ("Loading CER:// failed.", result);
GURL newtab_page("chrome://newtab");
@@ -228,9 +238,10 @@ IN_PROC_BROWSER_TEST_F(ExtensionResourceRequestPolicyTest,
ui_test_utils::NavigateToURLBlockUntilNavigationsComplete(
browser(), accessible_newtab_override, 2);
ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString(
- chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"",
- L"window.domAutomationController.send(document.title)",
- &result));
+ chrome::GetActiveWebContents(browser())->GetRenderViewHost(),
+ "",
+ "window.domAutomationController.send(document.title)",
+ &result));
EXPECT_EQ("New Tab Page Loaded Successfully", result);
}
@@ -248,9 +259,10 @@ IN_PROC_BROWSER_TEST_F(ExtensionResourceRequestPolicyTest,
"web_accessible/accessible_resource_with_csp.html"));
ui_test_utils::NavigateToURL(browser(), accessible_resource_with_csp);
ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString(
- chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"",
- L"window.domAutomationController.send(document.title)",
- &result));
+ chrome::GetActiveWebContents(browser())->GetRenderViewHost(),
+ "",
+ "window.domAutomationController.send(document.title)",
+ &result));
EXPECT_EQ("Loaded", result);
}
« no previous file with comments | « chrome/browser/extensions/extension_nacl_browsertest.cc ('k') | chrome/browser/extensions/extension_startup_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698