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

Unified Diff: chrome/browser/extensions/app_process_apitest.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
Index: chrome/browser/extensions/app_process_apitest.cc
===================================================================
--- chrome/browser/extensions/app_process_apitest.cc (revision 174946)
+++ chrome/browser/extensions/app_process_apitest.cc (working copy)
@@ -225,9 +225,8 @@
chrome::GetWebContentsAt(browser(), 6)->GetRenderProcessHost());
bool windowOpenerValid = false;
ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool(
- chrome::GetWebContentsAt(browser(), 6)->GetRenderViewHost(),
- "",
- "window.domAutomationController.send(window.opener != null)",
+ chrome::GetWebContentsAt(browser(), 6)->GetRenderViewHost(), L"",
+ L"window.domAutomationController.send(window.opener != null)",
&windowOpenerValid));
ASSERT_TRUE(windowOpenerValid);
@@ -436,7 +435,7 @@
content::Source<NavigationController>(
&chrome::GetActiveWebContents(browser())->GetController()));
ASSERT_TRUE(content::ExecuteJavaScript(contents->GetRenderViewHost(),
- "", "location.reload();"));
+ L"", L"location.reload();"));
js_reload_observer.Wait();
EXPECT_TRUE(process_map->Contains(
contents->GetRenderProcessHost()->GetID()));
@@ -448,7 +447,7 @@
content::Source<NavigationController>(
&chrome::GetActiveWebContents(browser())->GetController()));
ASSERT_TRUE(content::ExecuteJavaScript(contents->GetRenderViewHost(),
- "", "location = location;"));
+ L"", L"location = location;"));
js_reload_observer2.Wait();
EXPECT_FALSE(process_map->Contains(
contents->GetRenderProcessHost()->GetID()));
@@ -557,9 +556,8 @@
// App has loaded, and chrome.app.isInstalled should be true.
bool is_installed = false;
ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool(
- chrome::GetActiveWebContents(browser())->GetRenderViewHost(),
- "",
- "window.domAutomationController.send(chrome.app.isInstalled)",
+ chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"",
+ L"window.domAutomationController.send(chrome.app.isInstalled)",
&is_installed));
ASSERT_TRUE(is_installed);
}
@@ -627,9 +625,8 @@
contents->GetRenderProcessHost()->GetID()));
bool is_installed = false;
ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool(
- contents->GetRenderViewHost(),
- "",
- "window.domAutomationController.send(chrome.app.isInstalled)",
+ contents->GetRenderViewHost(), L"",
+ L"window.domAutomationController.send(chrome.app.isInstalled)",
&is_installed));
ASSERT_TRUE(is_installed);
@@ -642,9 +639,8 @@
chrome::Reload(browser(), CURRENT_TAB);
observer.Wait();
ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool(
- contents->GetRenderViewHost(),
- "",
- "window.domAutomationController.send(chrome.app.isInstalled)",
+ contents->GetRenderViewHost(), L"",
+ L"window.domAutomationController.send(chrome.app.isInstalled)",
&is_installed));
ASSERT_TRUE(is_installed);
}

Powered by Google App Engine
This is Rietveld 408576698