Convert LocationBar::GetInputString from wstring to string16.

chrome/browser/ui/views/location_bar/location_bar_view.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/views/location_bar/location_bar_view.h"
 
 #if defined(TOOLKIT_USES_GTK)
 #include <gtk/gtk.h>
 #endif
 
@@ skipping 799 matching lines @@
 #endif
 
 void LocationBarView::OnAutocompleteAccept(
     const GURL& url,
     WindowOpenDisposition disposition,
     PageTransition::Type transition,
     const GURL& alternate_nav_url) {
   // WARNING: don't add an early return here. The calls after the if must
   // happen.
   if (url.is_valid()) {
-    location_input_ = UTF8ToWide(url.spec());
+    location_input_ = UTF8ToUTF16(url.spec());
     disposition_ = disposition;
     transition_ = transition;
 
     if (browser_->command_updater()) {
       if (!alternate_nav_url.is_valid()) {
         browser_->command_updater()->ExecuteCommand(IDC_OPEN_CURRENT_URL);
       } else {
         AlternateNavURLFetcher* fetcher =
             new AlternateNavURLFetcher(alternate_nav_url);
         // The AlternateNavURLFetcher will listen for the pending navigation
@@ skipping 293 matching lines @@
     return;
   }
   ShowFirstRunBubbleInternal(bubble_type);
 }
 
 void LocationBarView::SetSuggestedText(const string16& text,
                                        InstantCompleteBehavior behavior) {
   location_entry_->model()->SetSuggestedText(text, behavior);
 }
 
-std::wstring LocationBarView::GetInputString() const {
+string16 LocationBarView::GetInputString() const {
   return location_input_;
 }
 
 WindowOpenDisposition LocationBarView::GetWindowOpenDisposition() const {
   return disposition_;
 }
 
 PageTransition::Type LocationBarView::GetPageTransition() const {
   return transition_;
 }
@@ skipping 109 matching lines @@
 bool LocationBarView::HasValidSuggestText() const {
   return suggested_text_view_ && !suggested_text_view_->size().IsEmpty() &&
       !suggested_text_view_->GetText().empty();
 }
 
 OmniboxViewWin* LocationBarView::GetOmniboxViewWin() {
   CHECK(!views::Widget::IsPureViews());
   return static_cast<OmniboxViewWin*>(location_entry_.get());
 }
 #endif