Revert 72380 - Remove wstring from autocomplete.

BUG=23581
TEST=no visible changes; all tests pass

Review URL: http://codereview.chromium.org/6258015

TBR=avi@chromium.org
Review URL: http://codereview.chromium.org/6256010

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72385 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 7 insertions, 7 deletions

diff --git a/chrome/browser/autocomplete/autocomplete_match.h b/chrome/browser/autocomplete/autocomplete_match.h
index bd7c489..88cbfee 100644
--- a/chrome/browser/autocomplete/autocomplete_match.h
+++ b/chrome/browser/autocomplete/autocomplete_match.h
@@ -108,8 +108,8 @@ struct AutocompleteMatch {
   // Fills in the classifications for |text|, using |style| as the base style
   // and marking the first instance of |find_text| as a match.  (This match
   // will also not be dimmed, if |style| has DIM set.)
-  static void ClassifyMatchInString(const string16& find_text,
-                                    const string16& text,
+  static void ClassifyMatchInString(const std::wstring& find_text,
+                                    const std::wstring& text,
                                     int style,
                                     ACMatchClassifications* classifications);
 
@@ -143,10 +143,10 @@ struct AutocompleteMatch {
   // This string is loaded into the location bar when the item is selected
   // by pressing the arrow keys. This may be different than a URL, for example,
   // for search suggestions, this would just be the search terms.
-  string16 fill_into_edit;
+  std::wstring fill_into_edit;
 
   // The position within fill_into_edit from which we'll display the inline
-  // autocomplete string.  This will be string16::npos if this match should
+  // autocomplete string.  This will be std::wstring::npos if this match should
   // not be inline autocompleted.
   size_t inline_autocomplete_offset;
 
@@ -156,11 +156,11 @@ struct AutocompleteMatch {
   GURL destination_url;
 
   // The main text displayed in the address bar dropdown.
-  string16 contents;
+  std::wstring contents;
   ACMatchClassifications contents_class;
 
   // Additional helper text for each entry, such as a title or description.
-  string16 description;
+  std::wstring description;
   ACMatchClassifications description_class;
 
   // The transition type to use when the user opens this match.  By default
@@ -188,7 +188,7 @@ struct AutocompleteMatch {
 
   // Checks one text/classifications pair for valid values.
   void ValidateClassifications(
-      const string16& text,
+      const std::wstring& text,
       const ACMatchClassifications& classifications) const;
 #endif
 };