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

chrome/browser/debugger/devtools_window.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 "base/command_line.h"
 #include "base/json/json_writer.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/browser_list.h"
@@ skipping 258 matching lines @@
 bool DevToolsWindow::IsInspectedBrowserPopup() {
   Browser* browser = NULL;
   int tab;
   if (!FindInspectedBrowserAndTabIndex(&browser, &tab))
     return false;
 
   return (browser->type() & Browser::TYPE_POPUP) != 0;
 }
 
 void DevToolsWindow::SetAttachedWindow() {
-  tab_contents_->render_view_host()->
-      ExecuteJavascriptInWebFrame(
-          L"", docked_ ? L"WebInspector.setAttachedWindow(true);" :
-                         L"WebInspector.setAttachedWindow(false);");
+  tab_contents_->render_view_host()->ExecuteJavascriptInWebFrame(
+      string16(),
+      docked_ ? ASCIIToUTF16("WebInspector.setAttachedWindow(true);")
+              : ASCIIToUTF16("WebInspector.setAttachedWindow(false);"));
 }
 
 
 void DevToolsWindow::AddDevToolsExtensionsToClient() {
   if (inspected_tab_) {
     FundamentalValue tabId(inspected_tab_->controller().session_id().id());
-    CallClientFunction(L"WebInspector.setInspectedTabId", tabId);
+    CallClientFunction(ASCIIToUTF16("WebInspector.setInspectedTabId"), tabId);
   }
   ListValue results;
   const ExtensionService* extension_service =
       tab_contents_->tab_contents()->profile()->
           GetOriginalProfile()->GetExtensionService();
   if (!extension_service)
     return;
 
   const ExtensionList* extensions = extension_service->extensions();
 
   for (ExtensionList::const_iterator extension = extensions->begin();
        extension != extensions->end(); ++extension) {
     if ((*extension)->devtools_url().is_empty())
       continue;
     DictionaryValue* extension_info = new DictionaryValue();
     extension_info->Set("startPage",
         new StringValue((*extension)->devtools_url().spec()));
     results.Append(extension_info);
   }
-  CallClientFunction(L"WebInspector.addExtensions", results);
+  CallClientFunction(ASCIIToUTF16("WebInspector.addExtensions"), results);
 }
 
-void DevToolsWindow::CallClientFunction(const std::wstring& function_name,
-                                         const Value& arg) {
+void DevToolsWindow::CallClientFunction(const string16& function_name,
+                                        const Value& arg) {
   std::string json;
   base::JSONWriter::Write(&arg, false, &json);
-  std::wstring javascript = function_name + L"(" + UTF8ToWide(json) + L");";
+  string16 javascript = function_name + char16('(') + UTF8ToUTF16(json) +

[Evan Martin, 2011/02/04 21:37:29]

Is char16() needed here?  I think '(' should be sufficient?

[Avi (use Gerrit), 2011/02/04 23:02:11]

No; there is no operator+ for string16 and char.

+      ASCIIToUTF16(");");
   tab_contents_->render_view_host()->
-      ExecuteJavascriptInWebFrame(L"", javascript);
+      ExecuteJavascriptInWebFrame(string16(), javascript);
 }
 
 void DevToolsWindow::Observe(NotificationType type,
                              const NotificationSource& source,
                              const NotificationDetails& details) {
   if (type == NotificationType::LOAD_STOP && !is_loaded_) {
     SetAttachedWindow();
     is_loaded_ = true;
     UpdateTheme();
     DoAction();
@@ skipping 16 matching lines @@
 void DevToolsWindow::ScheduleAction(DevToolsToggleAction action) {
   action_on_load_ = action;
   if (is_loaded_)
     DoAction();
 }
 
 void DevToolsWindow::DoAction() {
   // TODO: these messages should be pushed through the WebKit API instead.
   switch (action_on_load_) {
     case DEVTOOLS_TOGGLE_ACTION_SHOW_CONSOLE:
-      tab_contents_->render_view_host()->
-          ExecuteJavascriptInWebFrame(L"", L"WebInspector.showConsole();");
+      tab_contents_->render_view_host()->ExecuteJavascriptInWebFrame(
+          string16(), ASCIIToUTF16("WebInspector.showConsole();"));
       break;
     case DEVTOOLS_TOGGLE_ACTION_INSPECT:
-      tab_contents_->render_view_host()->
-          ExecuteJavascriptInWebFrame(
-              L"", L"WebInspector.toggleSearchingForNode();");
+      tab_contents_->render_view_host()->ExecuteJavascriptInWebFrame(
+          string16(), ASCIIToUTF16("WebInspector.toggleSearchingForNode();"));
     case DEVTOOLS_TOGGLE_ACTION_NONE:
       // Do nothing.
       break;
     default:
       NOTREACHED();
   }
   action_on_load_ = DEVTOOLS_TOGGLE_ACTION_NONE;
 }
 
 std::string SkColorToRGBAString(SkColor color) {
@@ skipping 28 matching lines @@
 
   SkColor color_toolbar =
       tp->GetColor(BrowserThemeProvider::COLOR_TOOLBAR);
   SkColor color_tab_text =
       tp->GetColor(BrowserThemeProvider::COLOR_BOOKMARK_TEXT);
   std::string command = StringPrintf(
       "WebInspector.setToolbarColors(\"%s\", \"%s\")",
       SkColorToRGBAString(color_toolbar).c_str(),
       SkColorToRGBAString(color_tab_text).c_str());
   tab_contents_->render_view_host()->
-      ExecuteJavascriptInWebFrame(L"", UTF8ToWide(command));
+      ExecuteJavascriptInWebFrame(string16(), UTF8ToUTF16(command));
 }
 
 void DevToolsWindow::AddNewContents(TabContents* source,
                                     TabContents* new_contents,
                                     WindowOpenDisposition disposition,
                                     const gfx::Rect& initial_pos,
                                     bool user_gesture) {
   inspected_tab_->delegate()->AddNewContents(source,
                                              new_contents,
                                              disposition,
@@ skipping 16 matching lines @@
   return false;
 }
 
 void DevToolsWindow::HandleKeyboardEvent(const NativeWebKeyboardEvent& event) {
   if (docked_) {
     BrowserWindow* inspected_window = GetInspectedBrowserWindow();
     if (inspected_window)
       inspected_window->HandleKeyboardEvent(event);
   }
 }