Remove wstring from RVH's run Javascript command....

chrome/test/ui_test_utils.cc

 // Copyright (c) 2010 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/test/ui_test_utils.h"
 
 #include <vector>
 
 #include "base/callback.h"
 #include "base/command_line.h"
@@ skipping 270 matching lines @@
       public JavaScriptExecutionController {
  public:
   explicit InProcessJavaScriptExecutionController(
       RenderViewHost* render_view_host)
       : render_view_host_(render_view_host) {}
 
  protected:
   // Executes |script| and sets the JSON response |json|.
   virtual bool ExecuteJavaScriptAndGetJSON(const std::string& script,
                                            std::string* json) {
-    render_view_host_->ExecuteJavascriptInWebFrame(L"", UTF8ToWide(script));
+    render_view_host_->ExecuteJavascriptInWebFrame(string16(),
+                                                   UTF8ToUTF16(script));
     DOMOperationObserver dom_op_observer(render_view_host_);
     return dom_op_observer.GetResponse(json);
   }
 
   virtual void FirstObjectAdded() {
     AddRef();
   }
 
   virtual void LastObjectRemoved() {
     Release();
@@ skipping 14 matching lines @@
 // |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,
                              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;
-  render_view_host->ExecuteJavascriptInWebFrame(frame_xpath, script);
+  render_view_host->ExecuteJavascriptInWebFrame(WideToUTF16Hack(frame_xpath),
+                                                WideToUTF16Hack(script));
   DOMOperationObserver dom_op_observer(render_view_host);
   std::string json;
   if (!dom_op_observer.GetResponse(&json))
     return false;
 
   // Nothing more to do for callers that ignore the returned JS value.
   if (!result)
     return true;
 
   // Wrap |json| in an array before deserializing because valid JSON has an
@@ skipping 687 matching lines @@
   return taker.TakeRenderWidgetSnapshot(rwh, page_size, page_size, bitmap);
 }
 
 bool TakeEntirePageSnapshot(RenderViewHost* rvh, SkBitmap* bitmap) {
   DCHECK(bitmap);
   SnapshotTaker taker;
   return taker.TakeEntirePageSnapshot(rvh, bitmap);
 }
 
 }  // namespace ui_test_utils