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

content/public/test/browser_test_utils.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 "content/public/test/browser_test_utils.h"
 
 #include "base/command_line.h"
 #include "base/json/json_reader.h"
 #include "base/path_service.h"
 #include "base/process_util.h"
@@ skipping 15 matching lines @@
 #include "content/public/test/test_utils.h"
 #include "net/cookies/cookie_store.h"
 #include "net/test/python_utils.h"
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 static const int kDefaultWsPort = 8880;
 
 namespace content {
-
 namespace {
 
 class DOMOperationObserver : public NotificationObserver,
                              public WebContentsObserver {
  public:
   explicit DOMOperationObserver(RenderViewHost* render_view_host)
       : WebContentsObserver(WebContents::FromRenderViewHost(render_view_host)),
         did_respond_(false) {
     registrar_.Add(this, NOTIFICATION_DOM_OPERATION_RESPONSE,
                    Source<RenderViewHost>(render_view_host));
@@ skipping 25 matching lines @@
   NotificationRegistrar registrar_;
   std::string response_;
   bool did_respond_;
   scoped_refptr<MessageLoopRunner> message_loop_runner_;
 
   DISALLOW_COPY_AND_ASSIGN(DOMOperationObserver);
 };
 
 // Specifying a prototype so that we can add the WARN_UNUSED_RESULT attribute.
 bool ExecuteJavaScriptHelper(RenderViewHost* render_view_host,
-                             const std::wstring& frame_xpath,
-                             const std::wstring& original_script,
+                             const std::string& frame_xpath,
+                             const std::string& original_script,
                              scoped_ptr<Value>* result) WARN_UNUSED_RESULT;
 
 // Executes the passed |original_script| in the frame pointed to by
 // |frame_xpath|.  If |result| is not NULL, stores the value that the evaluation
 // of the script in |result|.  Returns true on success.
 bool ExecuteJavaScriptHelper(RenderViewHost* render_view_host,
-                             const std::wstring& frame_xpath,
-                             const std::wstring& original_script,
+                             const std::string& frame_xpath,
+                             const std::string& original_script,
                              scoped_ptr<Value>* result) {
   // TODO(jcampan): we should make the domAutomationController not require an
   //                automation id.
-  std::wstring script = L"window.domAutomationController.setAutomationId(0);" +
-      original_script;
+  std::string script =
+      "window.domAutomationController.setAutomationId(0);" + original_script;
   DOMOperationObserver dom_op_observer(render_view_host);
-  render_view_host->ExecuteJavascriptInWebFrame(WideToUTF16Hack(frame_xpath),
-                                                WideToUTF16Hack(script));
+  render_view_host->ExecuteJavascriptInWebFrame(UTF8ToUTF16(frame_xpath),
+                                                UTF8ToUTF16(script));
   std::string json;
   if (!dom_op_observer.WaitAndGetResponse(&json)) {
     DLOG(ERROR) << "Cannot communicate with DOMOperationObserver.";
     return false;
   }
 
   // Nothing more to do for callers that ignore the returned JS value.
   if (!result)
     return true;
 
@@ skipping 164 matching lines @@
   web_contents->GetRenderViewHost()->ForwardKeyboardEvent(char_event);
 
   NativeWebKeyboardEvent event_up;
   BuildSimpleWebKeyEvent(
       WebKit::WebInputEvent::KeyUp, key, control, shift, alt, command,
       &event_up);
   web_contents->GetRenderViewHost()->ForwardKeyboardEvent(event_up);
 }
 
 bool ExecuteJavaScript(RenderViewHost* render_view_host,
-                       const std::wstring& frame_xpath,
-                       const std::wstring& original_script) {
-  std::wstring script =
-      original_script + L";window.domAutomationController.send(0);";
+                       const std::string& frame_xpath,
+                       const std::string& original_script) {
+  std::string script =
+      original_script + ";window.domAutomationController.send(0);";
   return ExecuteJavaScriptHelper(render_view_host, frame_xpath, script, NULL);
 }
 
 bool ExecuteJavaScriptAndExtractInt(RenderViewHost* render_view_host,
-                                    const std::wstring& frame_xpath,
-                                    const std::wstring& script,
+                                    const std::string& frame_xpath,
+                                    const std::string& script,
                                     int* result) {
   DCHECK(result);
   scoped_ptr<Value> value;
   if (!ExecuteJavaScriptHelper(render_view_host, frame_xpath, script, &value) ||
       !value.get())
     return false;
 
   return value->GetAsInteger(result);
 }
 
 bool ExecuteJavaScriptAndExtractBool(RenderViewHost* render_view_host,
-                                     const std::wstring& frame_xpath,
-                                     const std::wstring& script,
+                                     const std::string& frame_xpath,
+                                     const std::string& script,
                                      bool* result) {
   DCHECK(result);
   scoped_ptr<Value> value;
   if (!ExecuteJavaScriptHelper(render_view_host, frame_xpath, script, &value) ||
       !value.get())
     return false;
 
   return value->GetAsBoolean(result);
 }
 
 bool ExecuteJavaScriptAndExtractString(RenderViewHost* render_view_host,
-                                       const std::wstring& frame_xpath,
-                                       const std::wstring& script,
+                                       const std::string& frame_xpath,
+                                       const std::string& script,
                                        std::string* result) {
   DCHECK(result);
   scoped_ptr<Value> value;
   if (!ExecuteJavaScriptHelper(render_view_host, frame_xpath, script, &value) ||
       !value.get())
     return false;
 
   return value->GetAsString(result);
 }
 
@@ skipping 126 matching lines @@
   }
   // The queue should not be empty, unless we were quit because of a timeout.
   if (message_queue_.empty())
     return false;
   if (message)
     *message = message_queue_.front();
   return true;
 }
 
 }  // namespace content