wstring cleanup in browser/ui/login

chrome/browser/ui/login/login_prompt_gtk.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 <gtk/gtk.h>
 
+#include "base/string16.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/password_manager/password_manager.h"
 #include "chrome/browser/tab_contents/tab_contents_view_gtk.h"
 #include "chrome/browser/tab_contents/tab_util.h"
 #include "chrome/browser/ui/gtk/constrained_window_gtk.h"
 #include "chrome/browser/ui/gtk/gtk_util.h"
 #include "chrome/browser/ui/login/login_model.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "content/browser/renderer_host/resource_dispatcher_host.h"
 #include "content/browser/tab_contents/navigation_controller.h"
@@ skipping 23 matching lines @@
         username_entry_(NULL),
         password_entry_(NULL),
         ok_(NULL) {
   }
 
   virtual ~LoginHandlerGtk() {
     root_.Destroy();
   }
 
   // LoginModelObserver implementation.
-  virtual void OnAutofillDataAvailable(const std::wstring& username,
-                                       const std::wstring& password) {
+  virtual void OnAutofillDataAvailable(const string16& username,
+                                       const string16& password) {
     DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
     // NOTE: Would be nice to use gtk_entry_get_text_length, but it is fairly
     // new and not always in our GTK version.
     if (strlen(gtk_entry_get_text(GTK_ENTRY(username_entry_))) == 0) {
       gtk_entry_set_text(GTK_ENTRY(username_entry_),
-                         WideToUTF8(username).c_str());
+                         UTF16ToUTF8(username).c_str());
       gtk_entry_set_text(GTK_ENTRY(password_entry_),
-                         WideToUTF8(password).c_str());
+                         UTF16ToUTF8(password).c_str());
       gtk_editable_select_region(GTK_EDITABLE(username_entry_), 0, -1);
     }
   }
 
   // LoginHandler:
   virtual void BuildViewForPasswordManager(PasswordManager* manager,
                                            const string16& explanation) {
     DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
     root_.Own(gtk_vbox_new(FALSE, ui::kContentAreaBorder));
@@ skipping 109 matching lines @@
   // button the default action and mess with the focus.
   gtk_widget_set_can_default(ok_, TRUE);
   gtk_widget_grab_default(ok_);
 }
 
 // static
 LoginHandler* LoginHandler::Create(net::AuthChallengeInfo* auth_info,
                                    net::URLRequest* request) {
   return new LoginHandlerGtk(auth_info, request);
 }