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

chrome/browser/ui/login/login_prompt.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 "chrome/browser/ui/login/login_prompt.h"
 
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/synchronization/lock.h"
@@ skipping 106 matching lines @@
 
 RenderViewHostDelegate* LoginHandler::GetRenderViewHostDelegate() const {
   RenderViewHost* rvh = RenderViewHost::FromID(render_process_host_id_,
                                                tab_contents_id_);
   if (!rvh)
     return NULL;
 
   return rvh->delegate();
 }
 
-void LoginHandler::SetAuth(const std::wstring& username,
-                           const std::wstring& password) {
+void LoginHandler::SetAuth(const string16& username,
+                           const string16& password) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   if (TestAndSetAuthHandled())
     return;
 
   // Tell the password manager the credentials were submitted / accepted.
   if (password_manager_) {
-    password_form_.username_value = WideToUTF16Hack(username);
-    password_form_.password_value = WideToUTF16Hack(password);
+    password_form_.username_value = username;
+    password_form_.password_value = password;
     password_manager_->ProvisionallySavePassword(password_form_);
   }
 
   // Calling NotifyAuthSupplied() directly instead of posting a task
   // allows other LoginHandler instances to queue their
   // CloseContentsDeferred() before ours.  Closing dialogs in the
   // opposite order as they were created avoids races where remaining
   // dialogs in the same tab may be briefly displayed to the user
   // before they are removed.
   NotifyAuthSupplied(username, password);
@@ skipping 138 matching lines @@
   if (requesting_contents)
     controller = &requesting_contents->controller();
 
   LoginNotificationDetails details(this);
 
   service->Notify(NotificationType::AUTH_CANCELLED,
                   Source<NavigationController>(controller),
                   Details<LoginNotificationDetails>(&details));
 }
 
-void LoginHandler::NotifyAuthSupplied(const std::wstring& username,
-                                      const std::wstring& password) {
+void LoginHandler::NotifyAuthSupplied(const string16& username,
+                                      const string16& password) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(WasAuthHandled());
 
   TabContents* requesting_contents = GetTabContentsForLogin();
   if (!requesting_contents)
     return;
 
   NotificationService* service = NotificationService::current();
   NavigationController* controller = &requesting_contents->controller();
   AuthSuppliedLoginNotificationDetails details(this, username, password);
@@ skipping 30 matching lines @@
 
 // Marks authentication as handled and returns the previous handled state.
 bool LoginHandler::TestAndSetAuthHandled() {
   base::AutoLock lock(handled_auth_lock_);
   bool was_handled = handled_auth_;
   handled_auth_ = true;
   return was_handled;
 }
 
 // Calls SetAuth from the IO loop.
-void LoginHandler::SetAuthDeferred(const std::wstring& username,
-                                   const std::wstring& password) {
+void LoginHandler::SetAuthDeferred(const string16& username,
+                                   const string16& password) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   if (request_) {
-    request_->SetAuth(WideToUTF16Hack(username), WideToUTF16Hack(password));
+    request_->SetAuth(username, password);
     ResetLoginHandlerForRequest(request_);
   }
 }
 
 // Calls CancelAuth from the IO loop.
 void LoginHandler::CancelAuthDeferred() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   if (request_) {
     request_->CancelAuth();
@@ skipping 50 matching lines @@
     handler_->SetPasswordManager(password_manager);
 
     string16 host_and_port_hack16 = WideToUTF16Hack(auth_info_->host_and_port);
     string16 realm_hack16 = WideToUTF16Hack(auth_info_->realm);
     string16 explanation = realm_hack16.empty() ?
         l10n_util::GetStringFUTF16(IDS_LOGIN_DIALOG_DESCRIPTION_NO_REALM,
                                    host_and_port_hack16) :
         l10n_util::GetStringFUTF16(IDS_LOGIN_DIALOG_DESCRIPTION,
                                    host_and_port_hack16,
                                    realm_hack16);
-    handler_->BuildViewForPasswordManager(password_manager,
-                                          UTF16ToWideHack(explanation));
+    handler_->BuildViewForPasswordManager(password_manager, explanation);
   }
 
  private:
   // Helper to create a PasswordForm and stuff it into a vector as input
   // for PasswordManager::PasswordFormsFound, the hook into PasswordManager.
   void MakeInputForPasswordManager(
       std::vector<PasswordForm>* password_manager_input) {
     PasswordForm dialog_form;
     if (LowerCaseEqualsASCII(auth_info_->scheme, "basic")) {
       dialog_form.scheme = PasswordForm::SCHEME_BASIC;
@@ skipping 38 matching lines @@
 // Public API
 
 LoginHandler* CreateLoginPrompt(net::AuthChallengeInfo* auth_info,
                                 net::URLRequest* request) {
   LoginHandler* handler = LoginHandler::Create(auth_info, request);
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE, new LoginDialogTask(
           request->url(), auth_info, handler));
   return handler;
 }