Revert 72380 - Remove wstring from autocomplete....

chrome/browser/autocomplete/history_provider.cc

 // 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.
 
 #include "chrome/browser/autocomplete/history_url_provider.h"
 
 #include <string>
 
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
@@ skipping 42 matching lines @@
         matches_.erase(i);
       }
       break;
     }
   }
   DCHECK(found) << "Asked to delete a URL that isn't in our set of matches";
   listener_->OnProviderUpdate(true);
 }
 
 // static
-string16 HistoryProvider::FixupUserInput(const AutocompleteInput& input) {
-  const string16& input_text = input.text();
+std::wstring HistoryProvider::FixupUserInput(const AutocompleteInput& input) {
+  const std::wstring& input_text = input.text();
   // Fixup and canonicalize user input.
-  const GURL canonical_gurl(URLFixerUpper::FixupURL(UTF16ToUTF8(input_text),
+  const GURL canonical_gurl(URLFixerUpper::FixupURL(WideToUTF8(input_text),
                                                     std::string()));
   std::string canonical_gurl_str(canonical_gurl.possibly_invalid_spec());
   if (canonical_gurl_str.empty()) {
     // This probably won't happen, but there are no guarantees.
     return input_text;
   }
 
   // If the user types a number, GURL will convert it to a dotted quad.
   // However, if the parser did not mark this as a URL, then the user probably
   // didn't intend this interpretation.  Since this can break history matching
   // for hostname beginning with numbers (e.g. input of "17173" will be matched
   // against "0.0.67.21" instead of the original "17173", failing to find
   // "17173.com"), swap the original hostname in for the fixed-up one.
   if ((input.type() != AutocompleteInput::URL) &&
       canonical_gurl.HostIsIPAddress()) {
     std::string original_hostname =
-        UTF16ToUTF8(input_text.substr(input.parts().host.begin,
-                                      input.parts().host.len));
+        WideToUTF8(input_text.substr(input.parts().host.begin,
+                                     input.parts().host.len));
     const url_parse::Parsed& parts =
         canonical_gurl.parsed_for_possibly_invalid_spec();
     // parts.host must not be empty when HostIsIPAddress() is true.
     DCHECK(parts.host.is_nonempty());
     canonical_gurl_str.replace(parts.host.begin, parts.host.len,
                                original_hostname);
   }
-  string16 output = UTF8ToUTF16(canonical_gurl_str);
+  std::wstring output = UTF8ToWide(canonical_gurl_str);
   // Don't prepend a scheme when the user didn't have one.  Since the fixer
   // upper only prepends the "http" scheme, that's all we need to check for.
   if (canonical_gurl.SchemeIs(chrome::kHttpScheme) &&
-      !url_util::FindAndCompareScheme(UTF16ToUTF8(input_text),
+      !url_util::FindAndCompareScheme(WideToUTF8(input_text),
                                       chrome::kHttpScheme, NULL))
     TrimHttpPrefix(&output);
 
   // Make the number of trailing slashes on the output exactly match the input.
   // Examples of why not doing this would matter:
   // * The user types "a" and has this fixed up to "a/".  Now no other sites
   //   beginning with "a" will match.
   // * The user types "file:" and has this fixed up to "file://".  Now inline
   //   autocomplete will append too few slashes, resulting in e.g. "file:/b..."
   //   instead of "file:///b..."
   // * The user types "http:/" and has this fixed up to "http:".  Now inline
   //   autocomplete will append too many slashes, resulting in e.g.
   //   "http:///c..." instead of "http://c...".
   // NOTE: We do this after calling TrimHttpPrefix() since that can strip
   // trailing slashes (if the scheme is the only thing in the input).  It's not
   // clear that the result of fixup really matters in this case, but there's no
   // harm in making sure.
-  const size_t last_input_nonslash =
-      input_text.find_last_not_of(ASCIIToUTF16("/\\"));
-  const size_t num_input_slashes = (last_input_nonslash == string16::npos) ?
+  const size_t last_input_nonslash = input_text.find_last_not_of(L"/\\");
+  const size_t num_input_slashes = (last_input_nonslash == std::wstring::npos) ?
       input_text.length() : (input_text.length() - 1 - last_input_nonslash);
-  const size_t last_output_nonslash =
-      output.find_last_not_of(ASCIIToUTF16("/\\"));
+  const size_t last_output_nonslash = output.find_last_not_of(L"/\\");
   const size_t num_output_slashes =
-      (last_output_nonslash == string16::npos) ?
+      (last_output_nonslash == std::wstring::npos) ?
       output.length() : (output.length() - 1 - last_output_nonslash);
   if (num_output_slashes < num_input_slashes)
     output.append(num_input_slashes - num_output_slashes, '/');
   else if (num_output_slashes > num_input_slashes)
     output.erase(output.length() - num_output_slashes + num_input_slashes);
 
   return output;
 }
 
 // static
-size_t HistoryProvider::TrimHttpPrefix(string16* url) {
+size_t HistoryProvider::TrimHttpPrefix(std::wstring* url) {
   // Find any "http:".
   if (!HasHTTPScheme(*url))
     return 0;
-  size_t scheme_pos =
-      url->find(ASCIIToUTF16(chrome::kHttpScheme) + char16(':'));
-  DCHECK(scheme_pos != string16::npos);
+  size_t scheme_pos = url->find(ASCIIToWide(chrome::kHttpScheme) + L":");
+  DCHECK(scheme_pos != std::wstring::npos);
 
   // Erase scheme plus up to two slashes.
   size_t prefix_end = scheme_pos + strlen(chrome::kHttpScheme) + 1;
   const size_t after_slashes = std::min(url->length(), prefix_end + 2);
-  while ((prefix_end < after_slashes) && ((*url)[prefix_end] == '/'))
+  while ((prefix_end < after_slashes) && ((*url)[prefix_end] == L'/'))
     ++prefix_end;
   url->erase(scheme_pos, prefix_end - scheme_pos);
   return (scheme_pos == 0) ? prefix_end : 0;
 }