wstring cleanup in browser/ui/login

chrome/browser/ui/login/login_prompt_ui.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/ui/login/login_prompt.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/json/json_reader.h"
+#include "base/string16.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/browser/ui/webui/chrome_url_data_manager.h"
 #include "chrome/browser/ui/webui/constrained_html_ui.h"
 #include "chrome/browser/ui/webui/html_dialog_ui.h"
 #include "chrome/common/jstemplate_builder.h"
 #include "chrome/common/url_constants.h"
 #include "content/browser/tab_contents/tab_contents.h"
@@ skipping 98 matching lines @@
   }
 
   // WebUIMessageHandler method:
   virtual void RegisterMessages() OVERRIDE {
     web_ui_->RegisterMessageCallback(
         "GetAutofill",
         base::Bind(&LoginHandlerHtmlDelegate::GetAutofill,
                    base::Unretained(this)));
   }
 
-  void ShowAutofillData(const std::wstring& username,
-                        const std::wstring& password);
+  void ShowAutofillData(const string16& username,
+                        const string16& password);
 
  private:
   // Send autofill data to HTML once the dialog is ready and the data is
   // available.
   void SendAutofillData();
 
   // Handle the request for autofill data from HTML.
   void GetAutofill(const ListValue* args) {
     ready_for_autofill_ = true;
     SendAutofillData();
   }
 
   LoginHandlerHtml* login_handler_;
   std::string explanation_;
   bool closed_;
 
   bool has_autofill_;
   bool ready_for_autofill_;
-  std::string autofill_username_;
-  std::string autofill_password_;
+  string16 autofill_username_;
+  string16 autofill_password_;
 
   static const int kDialogWidth = 400;
   static const int kDialogHeight = 160;
 
   DISALLOW_COPY_AND_ASSIGN(LoginHandlerHtmlDelegate);
 };
 
 class LoginHandlerHtml : public LoginHandler {
  public:
   LoginHandlerHtml(net::AuthChallengeInfo* auth_info, net::URLRequest* request)
       : LoginHandler(auth_info, request),
         delegate_(NULL) {
   }
 
   // LoginModelObserver method:
-  virtual void OnAutofillDataAvailable(const std::wstring& username,
-                                       const std::wstring& password) OVERRIDE {
+  virtual void OnAutofillDataAvailable(const string16& username,
+                                       const string16& password) OVERRIDE {
     if (delegate_)
       delegate_->ShowAutofillData(username, password);
   }
 
   // LoginHandler method:
   virtual void BuildViewForPasswordManager(
       PasswordManager* manager, const string16& explanation) OVERRIDE;
 
   friend class LoginHandlerHtmlDelegate;
 
@@ skipping 32 matching lines @@
       login_handler_->SetAuth(username, password);
     }
   }
 
   login_handler_->FreeAndRelease();
 
   // We don't need to delete |this| here: the WebUI object will delete us since
   // we've registered ourselves as a WebUIMessageHandler.
 }
 
-void LoginHandlerHtmlDelegate::ShowAutofillData(const std::wstring& username,
-                                                const std::wstring& password) {
-  autofill_username_ = WideToUTF8(username);
-  autofill_password_ = WideToUTF8(password);
+void LoginHandlerHtmlDelegate::ShowAutofillData(const string16& username,
+                                                const string16& password) {
+  autofill_username_ = username;
+  autofill_password_ = password;
   has_autofill_ = true;
   SendAutofillData();
 }
 
 void LoginHandlerHtmlDelegate::SendAutofillData() {
   if (!closed_ && web_ui_ && has_autofill_ && ready_for_autofill_) {
     StringValue username_v(autofill_username_);
     StringValue password_v(autofill_password_);
     web_ui_->CallJavascriptFunction("setAutofillCredentials",
                                     username_v, password_v);
@@ skipping 18 matching lines @@
   SetDialog(dialog);
 
   NotifyAuthNeeded();
 }
 
 // static
 LoginHandler* LoginHandler::Create(net::AuthChallengeInfo* auth_info,
                                    net::URLRequest* request) {
   return new LoginHandlerHtml(auth_info, request);
 }