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

chrome/browser/automation/automation_provider_observers.cc

 // Copyright (c) 2011 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/automation/automation_provider_observers.h"
 
 #include <deque>
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/file_util.h"
 #include "base/json/json_writer.h"
 #include "base/scoped_ptr.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "base/threading/thread_restrictions.h"
+#include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/automation/automation_provider.h"
 #include "chrome/browser/automation/automation_provider_json.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/dom_operation_notification_details.h"
 #include "chrome/browser/dom_ui/most_visited_handler.h"
 #include "chrome/browser/dom_ui/new_tab_ui.h"
@@ skipping 1340 matching lines @@
                                      IPC::Message* reply_message,
                                      RenderViewHost* render_view,
                                      const FilePath& path)
     : automation_(automation),
       reply_message_(reply_message),
       render_view_(render_view),
       image_path_(path),
       received_width_(false) {}
 
 void PageSnapshotTaker::Start() {
-  ExecuteScript(L"window.domAutomationController.send(document.width);");
+  ExecuteScript(
+      ASCIIToUTF16("window.domAutomationController.send(document.width);"));
 }
 
 void PageSnapshotTaker::OnDomOperationCompleted(const std::string& json) {
   int dimension;
   if (!base::StringToInt(json, &dimension)) {
     LOG(ERROR) << "Could not parse received dimensions: " << json;
     SendMessage(false);
   } else if (!received_width_) {
     received_width_ = true;
     entire_page_size_.set_width(dimension);
 
-    ExecuteScript(L"window.domAutomationController.send(document.height);");
+    ExecuteScript(
+        ASCIIToUTF16("window.domAutomationController.send(document.height);"));
   } else {
     entire_page_size_.set_height(dimension);
 
     ThumbnailGenerator* generator =
         g_browser_process->GetThumbnailGenerator();
     ThumbnailGenerator::ThumbnailReadyCallback* callback =
         NewCallback(this, &PageSnapshotTaker::OnSnapshotTaken);
     // Don't actually start the thumbnail generator, this leads to crashes on
     // Mac, crbug.com/62986. Instead, just hook the generator to the
     // RenderViewHost manually.
 
     generator->MonitorRenderer(render_view_, true);
     generator->AskForSnapshot(render_view_, false, callback,
                               entire_page_size_, entire_page_size_);
   }
 }
 
 void PageSnapshotTaker::OnSnapshotTaken(const SkBitmap& bitmap) {
   base::ThreadRestrictions::ScopedAllowIO allow_io;
   std::vector<unsigned char> png_data;
   gfx::PNGCodec::EncodeBGRASkBitmap(bitmap, true, &png_data);
   int bytes_written = file_util::WriteFile(image_path_,
       reinterpret_cast<char*>(&png_data[0]), png_data.size());
   SendMessage(bytes_written == static_cast<int>(png_data.size()));
 }
 
-void PageSnapshotTaker::ExecuteScript(const std::wstring& javascript) {
-  std::wstring set_automation_id;
+void PageSnapshotTaker::ExecuteScript(const string16& javascript) {
+  std::string set_automation_id;
   base::SStringPrintf(
       &set_automation_id,
-      L"window.domAutomationController.setAutomationId(%d);",
+      "window.domAutomationController.setAutomationId(%d);",
       reply_message_->routing_id());
 
-  render_view_->ExecuteJavascriptInWebFrame(L"", set_automation_id);
-  render_view_->ExecuteJavascriptInWebFrame(L"", javascript);
+  render_view_->ExecuteJavascriptInWebFrame(string16(),
+                                            UTF8ToUTF16(set_automation_id));
+  render_view_->ExecuteJavascriptInWebFrame(string16(),
+                                            javascript);
 }
 
 void PageSnapshotTaker::SendMessage(bool success) {
   AutomationMsg_CaptureEntirePageAsPNG::WriteReplyParams(reply_message_,
                                                          success);
   automation_->Send(reply_message_);
   delete this;
 }
 
 NTPInfoObserver::NTPInfoObserver(
@@ skipping 285 matching lines @@
       BrowserThread::PROCESS_LAUNCHER, FROM_HERE,
       NewRunnableMethod(
           this,
           &WaitForProcessLauncherThreadToGoIdleObserver::RunOnUIThread));
 }
 
 void WaitForProcessLauncherThreadToGoIdleObserver::RunOnUIThread() {
   automation_->Send(reply_message_);
   Release();
 }