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

chrome/browser/geolocation/geolocation_browsertest.cc

 // Copyright (c) 2009 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 "base/compiler_specific.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/dom_operation_notification_details.h"
@@ skipping 33 matching lines @@
     registrar_.Add(this, NotificationType::LOAD_STOP,
                    Source<NavigationController>(controller));
     registrar_.Add(this, NotificationType::DOM_OPERATION_RESPONSE,
                    NotificationService::AllSources());
     std::string script = StringPrintf(
         "window.domAutomationController.setAutomationId(0);"
         "window.domAutomationController.send(addIFrame(%d, \"%s\"));",
         iframe_id,
         url.spec().c_str());
     browser->GetSelectedTabContents()->render_view_host()->
-        ExecuteJavascriptInWebFrame(L"", UTF8ToWide(script));
+        ExecuteJavascriptInWebFrame(string16(), UTF8ToUTF16(script));
     ui_test_utils::RunMessageLoop();
 
     EXPECT_EQ(StringPrintf("\"%d\"", iframe_id), javascript_response_);
     registrar_.RemoveAll();
     // Now that we loaded the iframe, let's fetch its src.
     script = StringPrintf(
         "window.domAutomationController.send(getIFrameSrc(%d))", iframe_id);
     std::string iframe_src;
     EXPECT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractString(
         browser->GetSelectedTabContents()->render_view_host(),
@@ skipping 58 matching lines @@
                      NotificationService::AllSources());
     }
   }
 
   void AddWatchAndWaitForNotification(RenderViewHost* render_view_host,
                                       const std::wstring& iframe_xpath) {
     LOG(WARNING) << "will add geolocation watch";
     std::string script =
         "window.domAutomationController.setAutomationId(0);"
         "window.domAutomationController.send(geoStart());";
-    render_view_host->ExecuteJavascriptInWebFrame(iframe_xpath,
-                                                  UTF8ToWide(script));
+    render_view_host->ExecuteJavascriptInWebFrame(WideToUTF16Hack(iframe_xpath),
+                                                  UTF8ToUTF16(script));
     ui_test_utils::RunMessageLoop();
     registrar_.RemoveAll();
     LOG(WARNING) << "got geolocation watch" << javascript_response_;
     EXPECT_NE("\"0\"", javascript_response_);
     if (wait_for_infobar_) {
       EXPECT_TRUE(infobar_);
     } else {
       EXPECT_TRUE(navigation_completed_);
     }
   }
@@ skipping 497 matching lines @@
       "window.domAutomationController.setAutomationId(0);"
       "window.domAutomationController.send(window.close());";
   bool result =
       ui_test_utils::ExecuteJavaScript(
       current_browser_->GetSelectedTabContents()->render_view_host(),
       L"", UTF8ToWide(script));
   EXPECT_EQ(result, true);
 }
 
 }  // namespace