url: Get rid of UTF16Char type.

Now that Blink was merged into Chromium, this patch can be done without
the three-patch dance for something really trivial.

This patch just changes Blink code to use base::char16 type directly
instead of using deprecated url type.

BUG=None
R=brettw@chromium.org,dglazkov@chromium.org

Review URL: https://codereview.chromium.org/1381683003

Cr-Commit-Position: refs/heads/master@{#369078}

third_party/WebKit/Source/platform/weborigin/KURL.cpp

@@ -101,7 +101,7 @@ class KURLCharsetConverter final : public url::CharsetConverter {
     {
     }
 
-    void ConvertFromUTF16(const url::UTF16Char* input, int inputLength, url::CanonOutput* output) override
+    void ConvertFromUTF16(const base::char16* input, int inputLength, url::CanonOutput* output) override
     {
         CString encoded = m_encoding->encode(String(input, inputLength), WTF::URLEncodedEntitiesForUnencodables);
         output->Append(encoded.data(), static_cast<int>(encoded.length()));
@@ -676,7 +676,7 @@ String decodeURLEscapeSequences(const String& string, const WTF::TextEncoding& e
     // sucks, and we don't use the encoding properly, which will make some
     // obscure anchor navigations fail.
     StringUTF8Adaptor stringUTF8(string);
-    url::RawCanonOutputT<url::UTF16Char> unescaped;
+    url::RawCanonOutputT<base::char16> unescaped;
     url::DecodeURLEscapeSequences(stringUTF8.data(), stringUTF8.length(), &unescaped);
     return StringImpl::create8BitIfPossible(reinterpret_cast<UChar*>(unescaped.data()), unescaped.length());
 }

url/third_party/mozilla/url_parse.h

@@ -10,10 +10,6 @@
 
 namespace url {
 
-// Deprecated, but WebKit/WebCore/platform/KURLGooglePrivate.h and
-// KURLGoogle.cpp still rely on this type.
-typedef base::char16 UTF16Char;
-
 // Component ------------------------------------------------------------------
 
 // Represents a substring for URL parsing.