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

chrome/browser/browser_keyevents_browsertest.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 "build/build_config.h"
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/stringprintf.h"
@@ skipping 17 matching lines @@
 #include "net/test/test_server.h"
 #include "ui/base/keycodes/keyboard_codes.h"
 
 using content::DomOperationNotificationDetails;
 using content::NavigationController;
 using content::RenderViewHost;
 
 namespace {
 
 const char kTestingPage[] = "files/keyevents_test.html";
-const wchar_t kSuppressEventJS[] =
-    L"window.domAutomationController.send(setDefaultAction('%ls', %ls));";
-const wchar_t kGetResultJS[] =
-    L"window.domAutomationController.send(keyEventResult[%d]);";
-const wchar_t kGetResultLengthJS[] =
-    L"window.domAutomationController.send(keyEventResult.length);";
-const wchar_t kGetFocusedElementJS[] =
-    L"window.domAutomationController.send(focusedElement);";
-const wchar_t kSetFocusedElementJS[] =
-    L"window.domAutomationController.send(setFocusedElement('%ls'));";
-const wchar_t kGetTextBoxValueJS[] =
-    L"window.domAutomationController.send("
-    L"document.getElementById('%ls').value);";
-const wchar_t kSetTextBoxValueJS[] =
-    L"window.domAutomationController.send("
-    L"document.getElementById('%ls').value = '%ls');";
-const wchar_t kStartTestJS[] =
-    L"window.domAutomationController.send(startTest(%d));";
+const char kSuppressEventJS[] =
+    "window.domAutomationController.send(setDefaultAction('%ls', %ls));";
+const char kGetResultJS[] =
+    "window.domAutomationController.send(keyEventResult[%d]);";
+const char kGetResultLengthJS[] =
+    "window.domAutomationController.send(keyEventResult.length);";
+const char kGetFocusedElementJS[] =
+    "window.domAutomationController.send(focusedElement);";
+const char kSetFocusedElementJS[] =
+    "window.domAutomationController.send(setFocusedElement('%ls'));";
+const char kGetTextBoxValueJS[] =
+    "window.domAutomationController.send("
+    "    document.getElementById('%ls').value);";
+const char kSetTextBoxValueJS[] =
+    "window.domAutomationController.send("
+    "    document.getElementById('%ls').value = '%ls');";
+const char kStartTestJS[] =
+    "window.domAutomationController.send(startTest(%d));";
 
 // Maximum lenght of the result array in KeyEventTestData structure.
 const size_t kMaxResultLength = 10;
 
 // A structure holding test data of a keyboard event.
 // Each keyboard event may generate multiple result strings representing
 // the result of keydown, keypress, keyup and textInput events.
 // For keydown, keypress and keyup events, the format of the result string is:
 // <type> <keyCode> <charCode> <ctrlKey> <shiftKey> <altKey> <commandKey>
 // where <type> may be 'D' (keydown), 'P' (keypress) or 'U' (keyup).
@@ skipping 75 matching lines @@
   }
 
   // Set the suppress flag of an event specified by |type|. If |suppress| is
   // true then the web page will suppress all events with |type|. Following
   // event types are supported: keydown, keypress, keyup and textInput.
   void SuppressEventByType(int tab_index, const wchar_t* type, bool suppress) {
     ASSERT_LT(tab_index, browser()->tab_count());
     bool actual;
     ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool(
         chrome::GetWebContentsAt(browser(), tab_index)->GetRenderViewHost(),
-        L"",
+        "",
         base::StringPrintf(kSuppressEventJS, type, GetBoolString(!suppress)),
         &actual));
     ASSERT_EQ(!suppress, actual);
   }
 
   void SuppressEvents(int tab_index, bool keydown, bool keypress,
                       bool keyup, bool textinput) {
     ASSERT_NO_FATAL_FAILURE(
         SuppressEventByType(tab_index, L"keydown", keydown));
     ASSERT_NO_FATAL_FAILURE(
         SuppressEventByType(tab_index, L"keypress", keypress));
     ASSERT_NO_FATAL_FAILURE(
         SuppressEventByType(tab_index, L"keyup", keyup));
     ASSERT_NO_FATAL_FAILURE(
         SuppressEventByType(tab_index, L"textInput", textinput));
   }
 
   void SuppressAllEvents(int tab_index, bool suppress) {
     SuppressEvents(tab_index, suppress, suppress, suppress, suppress);
   }
 
   void GetResultLength(int tab_index, int* length) {
     ASSERT_LT(tab_index, browser()->tab_count());
     ASSERT_TRUE(content::ExecuteJavaScriptAndExtractInt(
         chrome::GetWebContentsAt(browser(), tab_index)->GetRenderViewHost(),
-        L"", kGetResultLengthJS, length));
+        "",
+        kGetResultLengthJS,
+        length));
   }
 
   void CheckResult(int tab_index, int length, const char* const result[]) {
     ASSERT_LT(tab_index, browser()->tab_count());
     int actual_length;
     ASSERT_NO_FATAL_FAILURE(GetResultLength(tab_index, &actual_length));
     ASSERT_GE(actual_length, length);
     for (int i = 0; i < actual_length; ++i) {
       std::string actual;
       ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString(
           chrome::GetWebContentsAt(browser(), tab_index)->GetRenderViewHost(),
-          L"", base::StringPrintf(kGetResultJS, i), &actual));
+          "",
+          base::StringPrintf(kGetResultJS, i),
+          &actual));
 
       // If more events were received than expected, then the additional events
       // must be keyup events.
       if (i < length)
         ASSERT_STREQ(result[i], actual.c_str());
       else
         ASSERT_EQ('U', actual[0]);
     }
   }
 
   void CheckFocusedElement(int tab_index, const wchar_t* focused) {
     ASSERT_LT(tab_index, browser()->tab_count());
     std::string actual;
     ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString(
         chrome::GetWebContentsAt(browser(), tab_index)->GetRenderViewHost(),
-        L"", kGetFocusedElementJS, &actual));
+        "",
+        kGetFocusedElementJS,
+        &actual));
     ASSERT_EQ(WideToUTF8(focused), actual);
   }
 
   void SetFocusedElement(int tab_index, const wchar_t* focused) {
     ASSERT_LT(tab_index, browser()->tab_count());
     bool actual;
     ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool(
         chrome::GetWebContentsAt(browser(), tab_index)->GetRenderViewHost(),
-        L"",
+        "",
         base::StringPrintf(kSetFocusedElementJS, focused),
         &actual));
     ASSERT_TRUE(actual);
   }
 
   void CheckTextBoxValue(int tab_index, const wchar_t* id,
                          const wchar_t* value) {
     ASSERT_LT(tab_index, browser()->tab_count());
     std::string actual;
     ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString(
         chrome::GetWebContentsAt(browser(), tab_index)->GetRenderViewHost(),
-        L"",
+        "",
         base::StringPrintf(kGetTextBoxValueJS, id),
         &actual));
     ASSERT_EQ(WideToUTF8(value), actual);
   }
 
   void SetTextBoxValue(int tab_index, const wchar_t* id,
                        const wchar_t* value) {
     ASSERT_LT(tab_index, browser()->tab_count());
     std::string actual;
     ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString(
         chrome::GetWebContentsAt(browser(), tab_index)->GetRenderViewHost(),
-        L"",
+        "",
         base::StringPrintf(kSetTextBoxValueJS, id, value),
         &actual));
     ASSERT_EQ(WideToUTF8(value), actual);
   }
 
   void StartTest(int tab_index, int result_length) {
     ASSERT_LT(tab_index, browser()->tab_count());
     bool actual;
     ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool(
         chrome::GetWebContentsAt(browser(), tab_index)->GetRenderViewHost(),
-        L"", base::StringPrintf(kStartTestJS, result_length), &actual));
+        "",
+        base::StringPrintf(kStartTestJS, result_length),
+        &actual));
     ASSERT_TRUE(actual);
   }
 
   void TestKeyEvent(int tab_index, const KeyEventTestData& test) {
     ASSERT_LT(tab_index, browser()->tab_count());
     ASSERT_EQ(tab_index, browser()->active_index());
 
     // Inform our testing web page that we are about to start testing a key
     // event.
     ASSERT_NO_FATAL_FAILURE(StartTest(tab_index, test.result_length));
@@ skipping 624 matching lines @@
   EXPECT_NO_FATAL_FAILURE(TestKeyEvent(tab_index, kTestAltKeySuppress));
   ASSERT_TRUE(IsViewFocused(VIEW_ID_TAB_CONTAINER));
 
   // Ctrl+Alt should have no effect.
   EXPECT_NO_FATAL_FAILURE(TestKeyEvent(tab_index, kTestCtrlAltKey));
   ASSERT_TRUE(IsViewFocused(VIEW_ID_TAB_CONTAINER));
 }
 #endif
 
 }  // namespace