url: Get rid of UTF16Char type.

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

 /*
  * Copyright (C) 2004, 2007, 2008, 2011, 2012 Apple Inc. All rights reserved.
  * Copyright (C) 2012 Research In Motion Limited. All rights reserved.
  * Copyright (C) 2008, 2009, 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
@@ skipping 83 matching lines @@
 
 class KURLCharsetConverter final : public url::CharsetConverter {
     DISALLOW_NEW();
 public:
     // The encoding parameter may be 0, but in this case the object must not be called.
     explicit KURLCharsetConverter(const WTF::TextEncoding* encoding)
         : m_encoding(encoding)
     {
     }
 
-    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()));
     }
 
 private:
     const WTF::TextEncoding* m_encoding;
 };
 
 } // namespace
@@ skipping 554 matching lines @@
     // without modification. However, I'm concerned about
     // https://bugs.webkit.org/show_bug.cgi?id=20559 so am keeping this old
     // custom code for now. Using their version will also fix the bug that
     // we ignore the encoding.
     //
     // FIXME b/1350291: This does not get called very often. We just convert
     // first to 8-bit UTF-8, then unescape, then back to 16-bit. This kind of
     // 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());
 }
 
 String encodeWithURLEscapeSequences(const String& notEncodedString)
 {
     CString utf8 = UTF8Encoding().encode(notEncodedString, WTF::URLEncodedEntitiesForUnencodables);
 
     url::RawCanonOutputT<char> buffer;
     int inputLength = utf8.length();
@@ skipping 224 matching lines @@
     m_string = AtomicString::fromUTF8(output.data(), output.length());
 }
 
 bool KURL::isSafeToSendToAnotherThread() const
 {
     return m_string.isSafeToSendToAnotherThread()
         && (!m_innerURL || m_innerURL->isSafeToSendToAnotherThread());
 }
 
 } // namespace blink