Move string16 and char16 in to base::

compat/non_win/dbghelp.h

 // Copyright 2014 The Crashpad Authors. All rights reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
 //     http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
@@ skipping 116 matching lines @@
 struct __attribute__((packed, aligned(4))) MINIDUMP_STRING {
   //! \brief The length of the #Buffer field in bytes, not including the `NUL`
   //!     terminator.
   //!
   //! \note This field is interpreted as a byte count, not a count of UTF-16
   //!     code units or Unicode code points.
   uint32_t Length;
 
   //! \brief The string, encoded in UTF-16, and terminated with a UTF-16 `NUL`
   //!     code unit (two `NUL` bytes).
-  char16 Buffer[0];
+  base::char16 Buffer[0];
 };
 
 //! \brief Minidump stream type values for MINIDUMP_DIRECTORY::StreamType. Each
 //!     stream structure has a corresponding stream type value to identify it.
 //!
 //! \sa crashpad::MinidumpStreamType
 enum MINIDUMP_STREAM_TYPE {
   //! \brief The stream type for MINIDUMP_THREAD_LIST.
   ThreadListStream = 3,
 
@@ skipping 654 matching lines @@
 //! \sa MINIDUMP_MISC_INFO_N
 struct __attribute__((packed, aligned(4))) MINIDUMP_MISC_INFO_4
     : public MINIDUMP_MISC_INFO_3 {
   //! \brief The operating system’s “build string”, a string identifying a
   //!     specific build of the operating system.
   //!
   //! This string is UTF-16-encoded and terminated by a UTF-16 `NUL` code unit.
   //!
   //! On Windows 8.1 (NT 6.3), this is “6.3.9600.17031
   //! (winblue_gdr.140221-1952)”.
-  char16 BuildString[260];
+  base::char16 BuildString[260];
 
   //! \brief The minidump producer’s “build string”, a string identifying the
   //!     module that produced a minidump file.
   //!
   //! This string is UTF-16-encoded and terminated by a UTF-16 `NUL` code unit.
   //!
   //! On Windows 8.1 (NT 6.3), this may be “dbghelp.i386,6.3.9600.16520” or
   //! “dbghelp.amd64,6.3.9600.16520” depending on CPU architecture.
-  char16 DbgBldStr[40];
+  base::char16 DbgBldStr[40];
 };
 
 //! \brief The latest known version of the MINIDUMP_MISC_INFO structure.
 typedef MINIDUMP_MISC_INFO_4 MINIDUMP_MISC_INFO_N;
 
 //! \brief Minidump file type values for MINIDUMP_HEADER::Flags. These bits
 //!     describe the types of data carried within a minidump file.
 enum MINIDUMP_TYPE {
   //! \brief A minidump file without any additional data.
   //!
   //! This type of minidump file contains:
   //!  - A MINIDUMP_SYSTEM_INFO stream.
   //!  - A MINIDUMP_MISC_INFO, MINIDUMP_MISC_INFO_2, MINIDUMP_MISC_INFO_3, or
   //!    MINIDUMP_MISC_INFO_4 stream, depending on which fields are present.
   //!  - A MINIDUMP_THREAD_LIST stream. All threads are present, along with a
   //!    snapshot of each thread’s stack memory sufficient to obtain backtraces.
   //!  - If the minidump file was generated as a result of an exception, a
   //!    MINIDUMP_EXCEPTION_STREAM describing the exception.
   //!  - A MINIDUMP_MODULE_LIST stream. All loaded modules are present.
   //!  - Typically, a MINIDUMP_MEMORY_LIST stream containing duplicate pointers
   //!    to the stack memory regions also referenced by the MINIDUMP_THREAD_LIST
   //!    stream. This type of minidump file also includes a
   //!    MINIDUMP_MEMORY_DESCRIPTOR containing the 256 bytes centered around
   //!    the exception address or the instruction pointer.
   MiniDumpNormal = 0x00000000,
 };
 
 #endif  // CRASHPAD_COMPAT_NON_WIN_DBGHELP_H_