Update from https://crrev.com/314320

net/base/net_string_util_icu_alternatives_android.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/base/net_string_util_icu_alternatives_android.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_piece.h"
@@ skipping 48 matching lines @@
   base::android::ScopedJavaLocalRef<jstring> java_charset =
       base::android::ConvertUTF8ToJavaString(env, base::StringPiece(charset));
   ScopedJavaLocalRef<jstring> java_result =
       android::Java_NetStringUtil_convertToUnicodeWithSubstitutions(
           env, java_byte_buffer.obj(), java_charset.obj());
   return java_result;
 }
 
 }  // namespace
 
-const char kCharsetLatin1[] = "ISO-8859-1";
+// This constant cannot be defined as const char[] because it is initialized
+// by base::kCodepageLatin1 (which is const char[]) in net_string_util_icu.cc.
+const char* const kCharsetLatin1 = "ISO-8859-1";
 
 bool ConvertToUtf8(const std::string& text, const char* charset,
                    std::string* output) {
   output->clear();
   ScopedJavaLocalRef<jstring> java_result = ConvertToJstring(text, charset);
   if (java_result.is_null())
     return false;
   *output = base::android::ConvertJavaStringToUTF8(java_result);
   return true;
 }
@@ skipping 29 matching lines @@
     return false;
   *output = base::android::ConvertJavaStringToUTF16(java_result);
   return true;
 }
 
 bool RegisterNetStringUtils(JNIEnv* env) {
   return android::RegisterNativesImpl(env);
 }
 
 }  // namespace net