Revert 72380 - Remove wstring from autocomplete....

chrome/browser/autocomplete/history_provider_util.h

 // Copyright (c) 2010 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.
 
 #ifndef CHROME_BROWSER_AUTOCOMPLETE_HISTORY_PROVIDER_UTIL_H_
 #define CHROME_BROWSER_AUTOCOMPLETE_HISTORY_PROVIDER_UTIL_H_
 #pragma once
 
 #include <deque>
 #include <vector>
@@ skipping 39 matching lines @@
   // A match after any scheme/"www.", if the user input could match at both
   // locations.  If the user types "w", an innermost match ("website.com") is
   // better than a non-innermost match ("www.google.com").  If the user types
   // "x", no scheme in our prefix list (or "www.") begins with x, so all
   // matches are, vacuously, "innermost matches".
   bool innermost_match;
 };
 typedef std::deque<HistoryMatch> HistoryMatches;
 
 struct Prefix {
-  Prefix(const string16& prefix, int num_components)
+  Prefix(const std::wstring& prefix, int num_components)
       : prefix(prefix),
         num_components(num_components) {}
 
-  string16 prefix;
+  std::wstring prefix;
 
   // The number of "components" in the prefix.  The scheme is a component,
   // and the initial "www." or "ftp." is a component.  So "http://foo.com"
   // and "www.bar.com" each have one component, "ftp://ftp.ftp.com" has two,
   // and "mysite.com" has none.  This is used to tell whether the user's
   // input is an innermost match or not.  See comments in HistoryMatch.
   int num_components;
 };
 typedef std::vector<Prefix> Prefixes;
 
 // Returns the date threshold for considering an history item as significant.
 base::Time AutocompleteAgeThreshold();
 
 }
 
 #endif  // CHROME_BROWSER_AUTOCOMPLETE_HISTORY_PROVIDER_UTIL_H_