Fix emulator build error

[platform/framework/web/chromium-efl.git] / base / i18n / icu_string_conversions.cc

diff --git a/base/i18n/icu_string_conversions.cc b/base/i18n/icu_string_conversions.cc
index 08a020f..434c6e8 100644 (file)
--- a/base/i18n/icu_string_conversions.cc
+++ b/base/i18n/icu_string_conversions.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2012 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -8,7 +8,6 @@
 #include <stdint.h>
 
 #include <memory>
-#include <vector>
 
 #include "base/check.h"
 #include "base/notreached.h"
@@ -102,8 +101,6 @@ bool ConvertFromUTF16(UConverter* converter,
       ucnv_setFromUCallBack(converter, UCNV_FROM_U_CALLBACK_SKIP, nullptr,
                             nullptr, nullptr, &status);
       break;
-    default:
-      NOTREACHED();
   }
 
   // ucnv_fromUChars returns size not including terminating null
@@ -134,8 +131,6 @@ void SetUpErrorHandlerForToUChars(OnStringConversionError::Type on_error,
       ucnv_setToUCallBack(converter, ToUnicodeCallbackSubstitute, nullptr,
                           nullptr, nullptr, status);
       break;
-    default:
-      NOTREACHED();
   }
 }
 
@@ -160,7 +155,7 @@ bool UTF16ToCodepage(base::StringPiece16 utf16,
 bool CodepageToUTF16(base::StringPiece encoded,
                      const char* codepage_name,
                      OnStringConversionError::Type on_error,
-                     string16* utf16) {
+                     std::u16string* utf16) {
   utf16->clear();
 
   UErrorCode status = U_ZERO_ERROR;
@@ -179,10 +174,10 @@ bool CodepageToUTF16(base::StringPiece encoded,
   size_t uchar_max_length = encoded.length() + 1;
 
   SetUpErrorHandlerForToUChars(on_error, converter, &status);
-  std::unique_ptr<char16[]> buffer(new char16[uchar_max_length]);
-  int actual_size = ucnv_toUChars(converter, buffer.get(),
-      static_cast<int>(uchar_max_length), encoded.data(),
-      static_cast<int>(encoded.length()), &status);
+  std::unique_ptr<char16_t[]> buffer(new char16_t[uchar_max_length]);
+  int actual_size = ucnv_toUChars(
+      converter, buffer.get(), static_cast<int>(uchar_max_length),
+      encoded.data(), static_cast<int>(encoded.length()), &status);
   ucnv_close(converter);
   if (!U_SUCCESS(status)) {
     utf16->clear();  // Make sure the output is empty on error.
@@ -197,7 +192,7 @@ bool ConvertToUtf8AndNormalize(base::StringPiece text,
                                const std::string& charset,
                                std::string* result) {
   result->clear();
-  string16 utf16;
+  std::u16string utf16;
   if (!CodepageToUTF16(text, charset.c_str(), OnStringConversionError::FAIL,
                        &utf16))
     return false;