Revert 72380 - Remove wstring from autocomplete....

chrome/browser/net/url_fixer_upper.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_NET_URL_FIXER_UPPER_H_
 #define CHROME_BROWSER_NET_URL_FIXER_UPPER_H_
 #pragma once
 
 #include <string>
 
-#include "base/string16.h"
 #include "googleurl/src/gurl.h"
 
 namespace url_parse {
   struct Component;
   struct Parsed;
 }
 
 class FilePath;
 
 // This object is designed to convert various types of input into URLs that we
 // know are valid. For example, user typing in the URL bar or command line
 // options. This is NOT the place for converting between different types of
 // URLs or parsing them, see net_util.h for that.
 namespace URLFixerUpper {
 
   // Segments the given text string into parts of a URL.  This is most useful
   // for schemes such as http, https, and ftp where |SegmentURL| will find many
   // segments.  Currently does not segment "file" schemes.
   // Returns the canonicalized scheme, or the empty string when |text| is only
   // whitespace.
   std::string SegmentURL(const std::string& text, url_parse::Parsed* parts);
-  // Deprecated temporary compatibility functions.
+  // Deprecated temporary compatibility function.
   std::wstring SegmentURL(const std::wstring& text, url_parse::Parsed* parts);
-#if defined(WCHAR_T_IS_UTF32)
-  string16 SegmentURL(const string16& text, url_parse::Parsed* parts);
-#endif
 
   // Converts |text| to a fixed-up URL and returns it. Attempts to make
   // some "smart" adjustments to obviously-invalid input where possible.
   // |text| may be an absolute path to a file, which will get converted to a
   // "file:" URL.
   //
   // The result will be a "more" valid URL than the input. It may still not
   // be valid, so check the return value's validity or use
   // possibly_invalid_spec().
   //
@@ skipping 27 matching lines @@
   // Does nothing if |part| is invalid.
   void OffsetComponent(int offset, url_parse::Component* part);
 
   // For paths like ~, we use $HOME for the current user's home
   // directory.  For tests, we allow our idea of $HOME to be overriden
   // by this variable.
   extern const char* home_directory_override;
 };
 
 #endif  // CHROME_BROWSER_NET_URL_FIXER_UPPER_H_