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

chrome/browser/automation/testing_automation_provider.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/testing_automation_provider.h"
 
 #include <map>
 #include <string>
 #include <vector>
 
@@ skipping 629 matching lines @@
       return;
     }
   }
 
   AutomationMsg_Reload::WriteReplyParams(
       reply_message, AUTOMATION_MSG_NAVIGATION_ERROR);
   Send(reply_message);
 }
 
 void TestingAutomationProvider::SetAuth(int tab_handle,
-                                        const std::wstring& username,
-                                        const std::wstring& password,
+                                        const string16& username,
+                                        const string16& password,
                                         IPC::Message* reply_message) {
   if (tab_tracker_->ContainsHandle(tab_handle)) {
     NavigationController* tab = tab_tracker_->GetResource(tab_handle);
     LoginHandlerMap::iterator iter = login_handler_map_.find(tab);
 
     if (iter != login_handler_map_.end()) {
       // If auth is needed again after this, assume login has failed.  This is
       // not strictly correct, because a navigation can require both proxy and
       // server auth, but it should be OK for now.
       LoginHandler* handler = iter->second;
@@ skipping 266 matching lines @@
     TabContents* tab_contents =
         tab_tracker_->GetResource(handle)->tab_contents();
     RenderProcessHost* rph = tab_contents->GetRenderProcessHost();
     if (rph)
       *process_id = base::GetProcId(rph->GetHandle());
   }
 }
 
 void TestingAutomationProvider::GetTabTitle(int handle,
                                             int* title_string_size,
-                                            std::wstring* title) {
+                                            string16* title) {
   *title_string_size = -1;  // -1 is the error code
   if (tab_tracker_->ContainsHandle(handle)) {
     NavigationController* tab = tab_tracker_->GetResource(handle);
     NavigationEntry* entry = tab->GetActiveEntry();
     if (entry != NULL) {
-      *title = UTF16ToWideHack(entry->title());
+      *title = entry->title();
     } else {
-      *title = std::wstring();
+      *title = string16();
     }
     *title_string_size = static_cast<int>(title->size());
   }
 }
 
 void TestingAutomationProvider::GetTabIndex(int handle, int* tabstrip_index) {
   *tabstrip_index = -1;  // -1 is the error code
 
   if (tab_tracker_->ContainsHandle(handle)) {
     NavigationController* tab = tab_tracker_->GetResource(handle);
@@ skipping 152 matching lines @@
   *query_in_progress = false;
   if (autocomplete_edit_tracker_->ContainsHandle(autocomplete_edit_handle)) {
     *query_in_progress = autocomplete_edit_tracker_->
         GetResource(autocomplete_edit_handle)->model()->query_in_progress();
     *success = true;
   }
 }
 
 void TestingAutomationProvider::ExecuteJavascript(
     int handle,
-    const std::wstring& frame_xpath,
-    const std::wstring& script,
+    const string16& frame_xpath,
+    const string16& script,
     IPC::Message* reply_message) {
   TabContents* tab_contents = GetTabContentsForHandle(handle, NULL);
   if (!tab_contents) {
     AutomationMsg_DomOperation::WriteReplyParams(reply_message, std::string());
     Send(reply_message);
     return;
   }
 
   // Set the routing id of this message with the controller.
   // This routing id needs to be remembered for the reverse
   // communication while sending back the response of
   // this javascript execution.
   std::string set_automation_id;
   base::SStringPrintf(&set_automation_id,
                       "window.domAutomationController.setAutomationId(%d);",
                       reply_message->routing_id());
 
   DCHECK(reply_message_ == NULL);
   reply_message_ = reply_message;
 
   tab_contents->render_view_host()->ExecuteJavascriptInWebFrame(
-      frame_xpath, UTF8ToWide(set_automation_id));
+      frame_xpath, UTF8ToUTF16(set_automation_id));
   tab_contents->render_view_host()->ExecuteJavascriptInWebFrame(
       frame_xpath, script);
 }
 
 void TestingAutomationProvider::GetConstrainedWindowCount(int handle,
                                                           int* count) {
   *count = -1;  // -1 is the error code
   if (tab_tracker_->ContainsHandle(handle)) {
     NavigationController* nav_controller = tab_tracker_->GetResource(handle);
     TabContents* tab_contents = nav_controller->tab_contents();
@@ skipping 363 matching lines @@
       // The observer will delete itself when done.
       new AutomationProviderBookmarkModelObserver(this, reply_message,
                                                   model);
     }
   }
 }
 
 void TestingAutomationProvider::AddBookmarkGroup(int handle,
                                                  int64 parent_id,
                                                  int index,
-                                                 std::wstring title,
+                                                 const string16& title,
                                                  bool* success) {
   if (browser_tracker_->ContainsHandle(handle)) {
     Browser* browser = browser_tracker_->GetResource(handle);
     if (browser) {
       BookmarkModel* model = browser->profile()->GetBookmarkModel();
       if (!model->IsLoaded()) {
         *success = false;
         return;
       }
       const BookmarkNode* parent = model->GetNodeByID(parent_id);
       DCHECK(parent);
       if (parent) {
-        const BookmarkNode* child = model->AddGroup(parent, index,
-                                                    WideToUTF16Hack(title));
+        const BookmarkNode* child = model->AddGroup(parent, index, title);
         DCHECK(child);
         if (child)
           *success = true;
       }
     }
   }
   *success = false;
 }
 
 void TestingAutomationProvider::AddBookmarkURL(int handle,
                                                int64 parent_id,
                                                int index,
-                                               std::wstring title,
+                                               const string16& title,
                                                const GURL& url,
                                                bool* success) {
   if (browser_tracker_->ContainsHandle(handle)) {
     Browser* browser = browser_tracker_->GetResource(handle);
     if (browser) {
       BookmarkModel* model = browser->profile()->GetBookmarkModel();
       if (!model->IsLoaded()) {
         *success = false;
         return;
       }
       const BookmarkNode* parent = model->GetNodeByID(parent_id);
       DCHECK(parent);
       if (parent) {
-        const BookmarkNode* child = model->AddURL(parent, index,
-                                                  WideToUTF16Hack(title), url);
+        const BookmarkNode* child = model->AddURL(parent, index, title, url);
         DCHECK(child);
         if (child)
           *success = true;
       }
     }
   }
   *success = false;
 }
 
 void TestingAutomationProvider::ReparentBookmark(int handle,
@@ skipping 17 matching lines @@
         model->Move(node, new_parent, index);
         *success = true;
       }
     }
   }
   *success = false;
 }
 
 void TestingAutomationProvider::SetBookmarkTitle(int handle,
                                                  int64 id,
-                                                 std::wstring title,
+                                                 const string16& title,
                                                  bool* success) {
   if (browser_tracker_->ContainsHandle(handle)) {
     Browser* browser = browser_tracker_->GetResource(handle);
     if (browser) {
       BookmarkModel* model = browser->profile()->GetBookmarkModel();
       if (!model->IsLoaded()) {
         *success = false;
         return;
       }
       const BookmarkNode* node = model->GetNodeByID(id);
       DCHECK(node);
       if (node) {
-        model->SetTitle(node, WideToUTF16Hack(title));
+        model->SetTitle(node, title);
         *success = true;
       }
     }
   }
   *success = false;
 }
 
 void TestingAutomationProvider::SetBookmarkURL(int handle,
                                                int64 id,
                                                const GURL& url,
@@ skipping 3011 matching lines @@
     // If you change this, update Observer for NotificationType::SESSION_END
     // below.
     MessageLoop::current()->PostTask(FROM_HERE,
         NewRunnableMethod(this, &TestingAutomationProvider::OnRemoveProvider));
   }
 }
 
 void TestingAutomationProvider::OnRemoveProvider() {
   AutomationProviderList::GetInstance()->RemoveProvider(this);
 }