Stop doing unnecessary UTF-8 to UTF-16 conversions in JSONWriter.

base/third_party/icu/icu_utf.h

 /*
 *******************************************************************************
 *
 *   Copyright (C) 1999-2004, International Business Machines
 *   Corporation and others.  All Rights Reserved.
 *
 *******************************************************************************
 *   file name:  utf.h
 *   encoding:   US-ASCII
 *   tab size:   8 (not used)
 *   indentation:4
 *
 *   created on: 1999sep09
 *   created by: Markus W. Scherer
 */
 
 #ifndef BASE_THIRD_PARTY_ICU_ICU_UTF_H_
 #define BASE_THIRD_PARTY_ICU_ICU_UTF_H_
 
 #include "base/basictypes.h"
 
 namespace base_icu {
 
 typedef uint32 UChar32;
+typedef uint16 UChar;
 typedef int8 UBool;
 
 // General ---------------------------------------------------------------------
 // from utf.h
 
 /**
  * This value is intended for sentinel values for APIs that
  * (take or) return single code points (UChar32).
  * It is outside of the Unicode code point range 0..0x10ffff.
  *
@@ skipping 262 matching lines @@
     (((base_icu::UChar32)(lead)<<10UL)+(base_icu::UChar32)(trail)-CBU16_SURROGATE_OFFSET)
 
 
 /**
  * Get the lead surrogate (0xd800..0xdbff) for a
  * supplementary code point (0x10000..0x10ffff).
  * @param supplementary 32-bit code point (U+10000..U+10ffff)
  * @return lead surrogate (U+d800..U+dbff) for supplementary
  * @stable ICU 2.4
  */
-#define CBU16_LEAD(supplementary) (UChar)(((supplementary)>>10)+0xd7c0)
+#define CBU16_LEAD(supplementary) (base_icu::UChar)(((supplementary)>>10)+0xd7c0)
 
 /**
  * Get the trail surrogate (0xdc00..0xdfff) for a
  * supplementary code point (0x10000..0x10ffff).
  * @param supplementary 32-bit code point (U+10000..U+10ffff)
  * @return trail surrogate (U+dc00..U+dfff) for supplementary
  * @stable ICU 2.4
  */
-#define CBU16_TRAIL(supplementary) (UChar)(((supplementary)&0x3ff)|0xdc00)
+#define CBU16_TRAIL(supplementary) (base_icu::UChar)(((supplementary)&0x3ff)|0xdc00)
 
 /**
  * How many 16-bit code units are used to encode this Unicode code point? (1 or 2)
  * The result is not defined if c is not a Unicode code point (U+0000..U+10ffff).
  * @param c 32-bit code point
  * @return 1 or 2
  * @stable ICU 2.4
  */
 #define CBU16_LENGTH(c) ((uint32)(c)<=0xffff ? 1 : 2)
 
@@ skipping 52 matching lines @@
         (s)[(i)++]=(uint16)(c); \
     } else { \
         (s)[(i)++]=(uint16)(((c)>>10)+0xd7c0); \
         (s)[(i)++]=(uint16)(((c)&0x3ff)|0xdc00); \
     } \
 }
 
 }  // namesapce base_icu
 
 #endif  // BASE_THIRD_PARTY_ICU_ICU_UTF_H_