Change ExecuteJavaScript* helper functions in browser_test_utils.{h,cc}

chrome/browser/extensions/extension_keybinding_apitest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/extensions/active_tab_permission_granter.h"
 #include "chrome/browser/extensions/browser_action_test_util.h"
 #include "chrome/browser/extensions/extension_action.h"
 #include "chrome/browser/extensions/extension_action_manager.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/extensions/tab_helper.h"
@@ skipping 72 matching lines @@
   // Activate the shortcut (Ctrl+Shift+F).
   ASSERT_TRUE(ui_test_utils::SendKeyPressSync(
       browser(), ui::VKEY_F, true, true, false, false));
 
   // activeTab should now be granted.
   EXPECT_TRUE(granter->IsGranted(extension));
 
   // Verify the command worked.
   bool result = false;
   ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool(
-      tab->GetRenderViewHost(), L"",
-      L"setInterval(function(){"
-      L"  if(document.body.bgColor == 'red'){"
-      L"    window.domAutomationController.send(true)}}, 100)",
+      tab->GetRenderViewHost(),
+      "",
+      "setInterval(function(){"
+      "  if(document.body.bgColor == 'red'){"
+      "    window.domAutomationController.send(true)}}, 100)",
       &result));
   ASSERT_TRUE(result);
 
   // Activate the shortcut (Ctrl+Shift+Y).
   ASSERT_TRUE(ui_test_utils::SendKeyPressSync(
       browser(), ui::VKEY_Y, true, true, false, false));
 
   result = false;
   ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool(
-      tab->GetRenderViewHost(), L"",
-      L"setInterval(function(){"
-      L"  if(document.body.bgColor == 'blue'){"
-      L"    window.domAutomationController.send(true)}}, 100)",
+      tab->GetRenderViewHost(),
+      "",
+      "setInterval(function(){"
+      "  if(document.body.bgColor == 'blue'){"
+      "    window.domAutomationController.send(true)}}, 100)",
       &result));
   ASSERT_TRUE(result);
 }
 
 // Flaky on linux and chromeos, http://crbug.com/165825
 #if defined(OS_MACOSX) || defined(OS_WIN)
 #define MAYBE_PageAction PageAction
 #else
 #define MAYBE_PageAction DISABLED_PageAction
 #endif
@@ skipping 23 matching lines @@
   EXPECT_EQ("Make this page red", action->GetTitle(tab_id));
 
   // Activate the shortcut (Alt+Shift+F).
   ASSERT_TRUE(ui_test_utils::SendKeyPressSync(
       browser(), ui::VKEY_F, false, true, true, false));
 
   // Verify the command worked (the page action turns the page red).
   WebContents* tab = chrome::GetActiveWebContents(browser());
   bool result = false;
   ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool(
-      tab->GetRenderViewHost(), L"",
-      L"setInterval(function(){"
-      L"  if(document.body.bgColor == 'red'){"
-      L"    window.domAutomationController.send(true)}}, 100)",
+      tab->GetRenderViewHost(),
+      "",
+      "setInterval(function(){"
+      "  if(document.body.bgColor == 'red'){"
+      "    window.domAutomationController.send(true)}}, 100)",
       &result));
   ASSERT_TRUE(result);
 }
 
 // Checked-in in a disabled state, because the necessary functionality to
 // automatically verify that the test works hasn't been implemented for the
 // script badges yet (see http://crbug.com/140016). The test results, can be
 // verified manually by running the test and verifying that the synthesized
 // popup for script badges appear. When bug 140016 has been fixed, the popup
 // code can signal to the test that the test passed.
@@ skipping 23 matching lines @@
 
 // This test validates that the getAll query API function returns registered
 // commands as well as synthesized ones and that inactive commands (like the
 // synthesized ones are in nature) have no shortcuts.
 IN_PROC_BROWSER_TEST_F(CommandsApiTest, SynthesizedCommand) {
   ASSERT_TRUE(test_server()->Start());
   ASSERT_TRUE(RunExtensionTest("keybinding/synthesized")) << message_;
 }
 
 }  // extensions