Update from https://crrev.com/312398

base/i18n/rtl.h

 // Copyright (c) 2011 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.
 
 #ifndef BASE_I18N_RTL_H_
 #define BASE_I18N_RTL_H_
 
 #include <string>
 
 #include "base/compiler_specific.h"
@@ skipping 22 matching lines @@
   LEFT_TO_RIGHT = 2,
   TEXT_DIRECTION_NUM_DIRECTIONS = 3,
 };
 
 // Get the locale that the currently running process has been configured to use.
 // The return value is of the form language[-country] (e.g., en-US) where the
 // language is the 2 or 3 letter code from ISO-639.
 BASE_I18N_EXPORT std::string GetConfiguredLocale();
 
 // Canonicalize a string (eg. a POSIX locale string) to a Chrome locale name.
-BASE_I18N_EXPORT std::string GetCanonicalLocale(const char* locale);
+BASE_I18N_EXPORT std::string GetCanonicalLocale(const std::string& locale);
 
 // Sets the default locale of ICU.
 // Once the application locale of Chrome in GetApplicationLocale is determined,
 // the default locale of ICU need to be changed to match the application locale
 // so that ICU functions work correctly in a locale-dependent manner.
 // This is handy in that we don't have to call GetApplicationLocale()
 // everytime we call locale-dependent ICU APIs as long as we make sure
 // that this is called before any locale-dependent API is called.
 BASE_I18N_EXPORT void SetICUDefaultLocale(const std::string& locale_string);
 
@@ skipping 86 matching lines @@
 // return the text itself. Explicit bidi control characters display and have
 // semantic effect. They can be deleted so they might not always appear in a
 // pair.
 BASE_I18N_EXPORT string16 StripWrappingBidiControlCharacters(
     const string16& text) WARN_UNUSED_RESULT;
 
 }  // namespace i18n
 }  // namespace base
 
 #endif  // BASE_I18N_RTL_H_