Remove wstring from autocomplete.

chrome/browser/autocomplete/autocomplete_popup_view_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/autocomplete/autocomplete_popup_view_gtk.h"
 
 #include <gtk/gtk.h>
 
 #include <algorithm>
 #include <string>
@@ skipping 88 matching lines @@
 void DrawFullPixbuf(GdkDrawable* drawable, GdkGC* gc, GdkPixbuf* pixbuf,
                     gint dest_x, gint dest_y) {
   gdk_draw_pixbuf(drawable, gc, pixbuf,
                   0, 0,                        // Source.
                   dest_x, dest_y,              // Dest.
                   -1, -1,                      // Width/height (auto).
                   GDK_RGB_DITHER_NONE, 0, 0);  // Don't dither.
 }
 
 // TODO(deanm): Find some better home for this, and make it more efficient.
-size_t GetUTF8Offset(const std::wstring& wide_text, size_t wide_text_offset) {
-  return WideToUTF8(wide_text.substr(0, wide_text_offset)).size();
+size_t GetUTF8Offset(const string16& text, size_t text_offset) {
+  return UTF16ToUTF8(text.substr(0, text_offset)).size();
 }
 
 // Generates the normal URL color, a green color used in unhighlighted URL
 // text. It is a mix of |kURLTextColor| and the current text color.  Unlike the
 // selected text color, it is more important to match the qualities of the
 // foreground typeface color instead of taking the background into account.
 GdkColor NormalURLColor(GdkColor foreground) {
   color_utils::HSL fg_hsl;
   color_utils::SkColorToHSL(gfx::GdkColorToSkColor(foreground), &fg_hsl);
 
@@ skipping 42 matching lines @@
   double opposite_l = fg_hsl.l;
   double l = std::max(0.1, std::min(0.9, opposite_l));
 
   color_utils::HSL output = { hue_hsl.h, s, l };
   return gfx::SkColorToGdkColor(color_utils::HSLToSkColor(output, 255));
 }
 }  // namespace
 
 void AutocompletePopupViewGtk::SetupLayoutForMatch(
     PangoLayout* layout,
-    const std::wstring& text,
+    const string16& text,
     const AutocompleteMatch::ACMatchClassifications& classifications,
     const GdkColor* base_color,
     const GdkColor* dim_color,
     const GdkColor* url_color,
     const std::string& prefix_text) {
   // In RTL, mark text with left-to-right embedding mark if there is no strong
   // RTL characters inside it, so the ending punctuation displays correctly
   // and the eliding ellipsis displays correctly. We only mark the text with
   // LRE. Wrapping it with LRE and PDF by calling AdjustStringForLocaleDirection
-  // will render the elllipsis at the left of the elided pure LTR text.
+  // or WrapStringWithLTRFormatting will render the elllipsis at the left of the
+  // elided pure LTR text.
   bool marked_with_lre = false;
-  std::wstring localized_text = text;
+  string16 localized_text = text;
   bool is_rtl = base::i18n::IsRTL();
   if (is_rtl && !base::i18n::StringContainsStrongRTLChars(localized_text)) {
-    localized_text.insert(0, 1,
-        static_cast<wchar_t>(base::i18n::kLeftToRightEmbeddingMark));
+    localized_text.insert(0, 1, base::i18n::kLeftToRightEmbeddingMark);
     marked_with_lre = true;
   }
 
   // We can have a prefix, or insert additional characters while processing the
   // classifications.  We need to take this in to account when we translate the
-  // wide offsets in the classification into text_utf8 byte offsets.
+  // UTF-16 offsets in the classification into text_utf8 byte offsets.
   size_t additional_offset = prefix_text.size();  // Length in utf-8 bytes.
-  std::string text_utf8 = prefix_text + WideToUTF8(localized_text);
+  std::string text_utf8 = prefix_text + UTF16ToUTF8(localized_text);
 
   PangoAttrList* attrs = pango_attr_list_new();
 
   // TODO(deanm): This is a hack, just to handle coloring prefix_text.
   // Hopefully I can clean up the match situation a bit and this will
   // come out cleaner.  For now, apply the base color to the whole text
   // so that our prefix will have the base color applied.
   PangoAttribute* base_fg_attr = pango_attr_foreground_new(
       base_color->red, base_color->green, base_color->blue);
   pango_attr_list_insert(attrs, base_fg_attr);  // Ownership taken.
@@ skipping 258 matching lines @@
   return std::min(line, model_->result().size() - 1);
 }
 
 void AutocompletePopupViewGtk::AcceptLine(size_t line,
                                           WindowOpenDisposition disposition) {
   const AutocompleteMatch& match = model_->result().match_at(line);
   // OpenURL() may close the popup, which will clear the result set and, by
   // extension, |match| and its contents.  So copy the relevant strings out to
   // make sure they stay alive until the call completes.
   const GURL url(match.destination_url);
-  std::wstring keyword;
+  string16 keyword;
   const bool is_keyword_hint = model_->GetKeywordForMatch(match, &keyword);
   edit_view_->OpenURL(url, disposition, match.transition, GURL(), line,
-                      is_keyword_hint ? std::wstring() : keyword);
+                      is_keyword_hint ? string16() : keyword);
 }
 
 GdkPixbuf* AutocompletePopupViewGtk::IconForMatch(
     const AutocompleteMatch& match, bool selected) {
   const SkBitmap* bitmap = model_->GetSpecialIconForMatch(match);
   if (bitmap) {
     if (!ContainsKey(pixbufs_, bitmap))
       pixbufs_[bitmap] = gfx::GdkPixbufFromSkBitmap(bitmap);
     return pixbufs_[bitmap];
   }
@@ skipping 175 matching lines @@
                           (text_width - actual_content_width -
                            (actual_description_width / PANGO_SCALE)),
                       content_y, layout_);
     }
   }
 
   g_object_unref(gc);
 
   return TRUE;
 }