Remove url::ReadUTFChar's dependency on icu. Use base instead.

url/url_canon_internal.h

 // Copyright 2013 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 URL_URL_CANON_INTERNAL_H_
 #define URL_URL_CANON_INTERNAL_H_
 
 // This file is intended to be included in another C++ file where the character
 // types are defined. This allows us to write mostly generic code, but not have
 // templace bloat because everything is inlined when anybody calls any of our
@@ skipping 130 matching lines @@
 // UTF-8 functions ------------------------------------------------------------
 
 // Reads one character in UTF-8 starting at |*begin| in |str| and places
 // the decoded value into |*code_point|. If the character is valid, we will
 // return true. If invalid, we'll return false and put the
 // kUnicodeReplacementCharacter into |*code_point|.
 //
 // |*begin| will be updated to point to the last character consumed so it
 // can be incremented in a loop and will be ready for the next character.
 // (for a single-byte ASCII character, it will not be changed).
-//
-// Implementation is in url_canon_icu.cc.
 URL_EXPORT bool ReadUTFChar(const char* str, int* begin, int length,
                             unsigned* code_point_out);
 
 // Generic To-UTF-8 converter. This will call the given append method for each
 // character that should be appended, with the given output method. Wrappers
 // are provided below for escaped and non-escaped versions of this.
 //
 // The char_value must have already been checked that it's a valid Unicode
 // character.
 template<class Output, void Appender(unsigned char, Output*)>
@@ skipping 55 matching lines @@
 // UTF-16 functions -----------------------------------------------------------
 
 // Reads one character in UTF-16 starting at |*begin| in |str| and places
 // the decoded value into |*code_point|. If the character is valid, we will
 // return true. If invalid, we'll return false and put the
 // kUnicodeReplacementCharacter into |*code_point|.
 //
 // |*begin| will be updated to point to the last character consumed so it
 // can be incremented in a loop and will be ready for the next character.
 // (for a single-16-bit-word character, it will not be changed).
-//
-// Implementation is in url_canon_icu.cc.
 URL_EXPORT bool ReadUTFChar(const base::char16* str, int* begin, int length,
-                            unsigned* code_point);
+                            unsigned* code_point_out);
 
 // Equivalent to U16_APPEND_UNSAFE in ICU but uses our output method.
 inline void AppendUTF16Value(unsigned code_point,
                              CanonOutputT<base::char16>* output) {
   if (code_point > 0xffff) {
     output->push_back(static_cast<base::char16>((code_point >> 10) + 0xd7c0));
     output->push_back(static_cast<base::char16>((code_point & 0x3ff) | 0xdc00));
   } else {
     output->push_back(static_cast<base::char16>(code_point));
   }
@@ skipping 186 matching lines @@
 inline unsigned long long _strtoui64(const char* nptr,
                                      char** endptr, int base) {
   return strtoull(nptr, endptr, base);
 }
 
 #endif  // WIN32
 
 }  // namespace url
 
 #endif  // URL_URL_CANON_INTERNAL_H_