Revert 71167 - Remove wstring from gfx....

chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_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/autocomplete/autocomplete_popup_contents_view.h"
 
 #include "app/bidi_line_iterator.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "app/theme_provider.h"
@@ skipping 653 matching lines @@
     const bool reverse_visible_order = (i->is_rtl != base::i18n::IsRTL());
     int flags = gfx::Canvas::NO_ELLIPSIS;  // We've already elided.
     if (reverse_visible_order) {
       std::reverse(i->classifications.begin(), i->classifications.end());
       if (i->is_rtl)
         flags |= gfx::Canvas::FORCE_RTL_DIRECTIONALITY;
     }
     for (Classifications::const_iterator j(i->classifications.begin());
          j != i->classifications.end(); ++j) {
       int left = mirroring_context_->mirrored_left_coord(x, x + j->pixel_width);
-      canvas->DrawStringInt(WideToUTF16Hack(j->text), *j->font, j->color, left,
-                            y, j->pixel_width, j->font->GetHeight(), flags);
+      canvas->DrawStringInt(j->text, *j->font, j->color, left, y,
+                            j->pixel_width, j->font->GetHeight(), flags);
       x += j->pixel_width;
     }
   }
 
   return x;
 }
 
 void AutocompleteResultView::Elide(Runs* runs, int remaining_width) const {
   // The complexity of this function is due to edge cases like the following:
   // We have 100 px of available space, an initial classification that takes 86
@@ skipping 518 matching lines @@
   opt_in_view_ = NULL;
   PromoCounter* counter = model_->profile()->GetInstantPromoCounter();
   DCHECK(counter);
   counter->Hide();
   if (opt_in) {
     browser::ShowInstantConfirmDialogIfNecessary(
         location_bar_->GetWindow()->GetNativeWindow(), model_->profile());
   }
   UpdatePopupAppearance();
 }