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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/ssl/ssl_browser_tests.cc

Issue 11734018: Revert 174880 due to compilation error in pdf_browsertest.cc (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1374/src/
Patch Set: 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/prerender/prerender_browsertest.cc ('k') | chrome/browser/tab_contents/view_source_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ssl/ssl_browser_tests.cc
===================================================================
--- chrome/browser/ssl/ssl_browser_tests.cc (revision 174946)
+++ chrome/browser/ssl/ssl_browser_tests.cc (working copy)
@@ -181,9 +181,8 @@
while (base::Time::Now() < timeToQuit) {
bool workerFinished = false;
ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool(
- tab->GetRenderViewHost(),
- "",
- "window.domAutomationController.send(IsWorkerFinished());",
+ tab->GetRenderViewHost(), std::wstring(),
+ L"window.domAutomationController.send(IsWorkerFinished());",
&workerFinished));
if (workerFinished)
@@ -199,9 +198,8 @@
bool actuallyLoadedContent = false;
ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool(
- tab->GetRenderViewHost(),
- "",
- "window.domAutomationController.send(IsContentLoaded());",
+ tab->GetRenderViewHost(), std::wstring(),
+ L"window.domAutomationController.send(IsContentLoaded());",
&actuallyLoadedContent));
EXPECT_EQ(expectLoaded, actuallyLoadedContent);
}
@@ -863,10 +861,8 @@
int img_width;
EXPECT_TRUE(content::ExecuteJavaScriptAndExtractInt(
- tab->GetRenderViewHost(),
- "",
- "window.domAutomationController.send(ImageWidth());",
- &img_width));
+ tab->GetRenderViewHost(), std::wstring(),
+ L"window.domAutomationController.send(ImageWidth());", &img_width));
// In order to check that the image was not loaded, we check its width.
// The actual image (Google logo) is 114 pixels wide, we assume the broken
// image is less than 100.
@@ -874,10 +870,8 @@
bool js_result = false;
EXPECT_TRUE(content::ExecuteJavaScriptAndExtractBool(
- tab->GetRenderViewHost(),
- "",
- "window.domAutomationController.send(IsFooSet());",
- &js_result));
+ tab->GetRenderViewHost(), std::wstring(),
+ L"window.domAutomationController.send(IsFooSet());", &js_result));
EXPECT_FALSE(js_result);
}
@@ -901,9 +895,7 @@
// Load the insecure image.
bool js_result = false;
EXPECT_TRUE(content::ExecuteJavaScriptAndExtractBool(
- tab->GetRenderViewHost(),
- "",
- "loadBadImage();",
+ tab->GetRenderViewHost(), std::wstring(), L"loadBadImage();",
&js_result));
EXPECT_TRUE(js_result);
@@ -1305,9 +1297,8 @@
content::NOTIFICATION_LOAD_STOP,
content::Source<NavigationController>(&tab->GetController()));
EXPECT_TRUE(content::ExecuteJavaScriptAndExtractBool(
- tab->GetRenderViewHost(),
- "",
- "window.domAutomationController.send(clickLink('goodHTTPSLink'));",
+ tab->GetRenderViewHost(), std::wstring(),
+ L"window.domAutomationController.send(clickLink('goodHTTPSLink'));",
&success));
ASSERT_TRUE(success);
observer.Wait();
@@ -1322,9 +1313,8 @@
content::NOTIFICATION_LOAD_STOP,
content::Source<NavigationController>(&tab->GetController()));
EXPECT_TRUE(content::ExecuteJavaScriptAndExtractBool(
- tab->GetRenderViewHost(),
- "",
- "window.domAutomationController.send(clickLink('badHTTPSLink'));",
+ tab->GetRenderViewHost(), std::wstring(),
+ L"window.domAutomationController.send(clickLink('badHTTPSLink'));",
&success));
ASSERT_TRUE(success);
observer.Wait();
@@ -1335,13 +1325,11 @@
// And the frame should be blocked.
bool is_content_evil = true;
- std::string content_frame_xpath("html/frameset/frame[2]");
- std::string is_evil_js("window.domAutomationController.send("
- "document.getElementById('evilDiv') != null);");
+ std::wstring content_frame_xpath(L"html/frameset/frame[2]");
+ std::wstring is_evil_js(L"window.domAutomationController.send("
+ L"document.getElementById('evilDiv') != null);");
EXPECT_TRUE(content::ExecuteJavaScriptAndExtractBool(
- tab->GetRenderViewHost(),
- content_frame_xpath,
- is_evil_js,
+ tab->GetRenderViewHost(), content_frame_xpath, is_evil_js,
&is_content_evil));
EXPECT_FALSE(is_content_evil);
@@ -1361,9 +1349,8 @@
content::NOTIFICATION_LOAD_STOP,
content::Source<NavigationController>(&tab->GetController()));
EXPECT_TRUE(content::ExecuteJavaScriptAndExtractBool(
- tab->GetRenderViewHost(),
- "",
- "window.domAutomationController.send(clickLink('HTTPLink'));",
+ tab->GetRenderViewHost(), std::wstring(),
+ L"window.domAutomationController.send(clickLink('HTTPLink'));",
&success));
ASSERT_TRUE(success);
observer.Wait();
@@ -1409,9 +1396,8 @@
content::NOTIFICATION_LOAD_STOP,
content::Source<NavigationController>(&tab->GetController()));
EXPECT_TRUE(content::ExecuteJavaScriptAndExtractBool(
- tab->GetRenderViewHost(),
- "",
- "window.domAutomationController.send(clickLink('goodHTTPSLink'));",
+ tab->GetRenderViewHost(), std::wstring(),
+ L"window.domAutomationController.send(clickLink('goodHTTPSLink'));",
&success));
ASSERT_TRUE(success);
observer.Wait();
@@ -1447,9 +1433,8 @@
content::NOTIFICATION_LOAD_STOP,
content::Source<NavigationController>(&tab->GetController()));
EXPECT_TRUE(content::ExecuteJavaScriptAndExtractBool(
- tab->GetRenderViewHost(),
- "",
- "window.domAutomationController.send(clickLink('goodHTTPSLink'));",
+ tab->GetRenderViewHost(), std::wstring(),
+ L"window.domAutomationController.send(clickLink('goodHTTPSLink'));",
&success));
ASSERT_TRUE(success);
observer.Wait();
@@ -1465,9 +1450,8 @@
content::NOTIFICATION_LOAD_STOP,
content::Source<NavigationController>(&tab->GetController()));
EXPECT_TRUE(content::ExecuteJavaScriptAndExtractBool(
- tab->GetRenderViewHost(),
- "",
- "window.domAutomationController.send(clickLink('badHTTPSLink'));",
+ tab->GetRenderViewHost(), std::wstring(),
+ L"window.domAutomationController.send(clickLink('badHTTPSLink'));",
&success));
ASSERT_TRUE(success);
observer.Wait();
@@ -1478,13 +1462,11 @@
// And the frame should have been blocked (see bug #2316).
bool is_content_evil = true;
- std::string content_frame_xpath("html/frameset/frame[2]");
- std::string is_evil_js("window.domAutomationController.send("
- "document.getElementById('evilDiv') != null);");
+ std::wstring content_frame_xpath(L"html/frameset/frame[2]");
+ std::wstring is_evil_js(L"window.domAutomationController.send("
+ L"document.getElementById('evilDiv') != null);");
EXPECT_TRUE(content::ExecuteJavaScriptAndExtractBool(
- tab->GetRenderViewHost(),
- content_frame_xpath,
- is_evil_js,
+ tab->GetRenderViewHost(), content_frame_xpath, is_evil_js,
&is_content_evil));
EXPECT_FALSE(is_content_evil);
}
« no previous file with comments | « chrome/browser/prerender/prerender_browsertest.cc ('k') | chrome/browser/tab_contents/view_source_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698