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

Unified Diff: chrome/browser/extensions/extension_dom_clipboard_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
Index: chrome/browser/extensions/extension_dom_clipboard_apitest.cc
diff --git a/chrome/browser/extensions/extension_dom_clipboard_apitest.cc b/chrome/browser/extensions/extension_dom_clipboard_apitest.cc
index 345e5a3077c6a84f8d38b3156b0fc57761847cb7..da8aa3c6b1f7886836ffa74e6cf40966c736e2ed 100644
--- a/chrome/browser/extensions/extension_dom_clipboard_apitest.cc
+++ b/chrome/browser/extensions/extension_dom_clipboard_apitest.cc
@@ -22,7 +22,7 @@ class ClipboardApiTest : public ExtensionApiTest {
bool ExecutePasteInSelectedTab(bool* result);
private:
- bool ExecuteScriptInSelectedTab(const std::wstring& script, bool* result);
+ bool ExecuteScriptInSelectedTab(const std::string& script, bool* result);
};
bool ClipboardApiTest::LoadHostedApp(const std::string& app_name,
@@ -54,22 +54,22 @@ bool ClipboardApiTest::LoadHostedApp(const std::string& app_name,
}
bool ClipboardApiTest::ExecuteCopyInSelectedTab(bool* result) {
- const wchar_t kScript[] =
- L"window.domAutomationController.send(document.execCommand('copy'))";
+ const char kScript[] =
+ "window.domAutomationController.send(document.execCommand('copy'))";
return ExecuteScriptInSelectedTab(kScript, result);
}
bool ClipboardApiTest::ExecutePasteInSelectedTab(bool* result) {
- const wchar_t kScript[] =
- L"window.domAutomationController.send(document.execCommand('paste'))";
+ const char kScript[] =
+ "window.domAutomationController.send(document.execCommand('paste'))";
return ExecuteScriptInSelectedTab(kScript, result);
}
-bool ClipboardApiTest::ExecuteScriptInSelectedTab(const std::wstring& script,
+bool ClipboardApiTest::ExecuteScriptInSelectedTab(const std::string& script,
bool* result) {
if (!content::ExecuteJavaScriptAndExtractBool(
chrome::GetActiveWebContents(browser())->GetRenderViewHost(),
- L"",
+ "",
script,
result)) {
message_ = "Failed to execute script in selected tab.";
« no previous file with comments | « chrome/browser/extensions/extension_browsertest.cc ('k') | chrome/browser/extensions/extension_icon_source_apitest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698