Prepare to enable icu_use_data_file_flat on CrOS

ui/base/l10n/l10n_util.cc

 // Copyright (c) 2012 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 "ui/base/l10n/l10n_util.h"
 
 #include <algorithm>
 #include <cstdlib>
 #include <iterator>
 #include <string>
@@ skipping 245 matching lines @@
 void AdjustParagraphDirectionality(base::string16* paragraph) {
 #if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
   if (base::i18n::IsRTL() &&
       base::i18n::StringContainsStrongRTLChars(*paragraph)) {
     paragraph->insert(0, 1,
                       static_cast<base::char16>(base::i18n::kRightToLeftMark));
   }
 #endif
 }
 
+base::string16 GetStringUTF16Raw(int message_id) {
+  ResourceBundle& rb = ResourceBundle::GetSharedInstance();
+  return rb.GetLocalizedString(message_id);
+}
+
 #if defined(OS_WIN)
 std::string GetCanonicalLocale(const std::string& locale) {
   return base::i18n::GetCanonicalLocale(locale.c_str());
 }
 #endif
 
 struct AvailableLocalesTraits
     : base::DefaultLazyInstanceTraits<std::vector<std::string> > {
   static std::vector<std::string>* New(void* instance) {
     std::vector<std::string>* locales =
@@ skipping 377 matching lines @@
   }
   if (token_index == 0 && (token_len < 1 || token_len > 3)) {
     return false;
   } else if (token_len < 1 || token_len > 8) {
     return false;
   }
 
   return true;
 }
 
+std::string GetStringUTF8Raw(int message_id) {
+  return base::UTF16ToUTF8(GetStringUTF16Raw(message_id));
+}
+
 std::string GetStringUTF8(int message_id) {
   return base::UTF16ToUTF8(GetStringUTF16(message_id));
 }
 
 base::string16 GetStringUTF16(int message_id) {
-  ResourceBundle& rb = ResourceBundle::GetSharedInstance();
-  base::string16 str = rb.GetLocalizedString(message_id);
+  base::string16 str = GetStringUTF16Raw(message_id);
   AdjustParagraphDirectionality(&str);
 
   return str;
 }
 
 base::string16 GetStringFUTF16(int message_id,
                                const std::vector<base::string16>& replacements,
                                std::vector<size_t>* offsets) {
   // TODO(tc): We could save a string copy if we got the raw string as
   // a StringPiece and were able to call ReplaceStringPlaceholders with
@@ skipping 201 matching lines @@
 }
 
 int GetLocalizedContentsWidthInPixels(int pixel_resource_id) {
   int width = 0;
   base::StringToInt(l10n_util::GetStringUTF8(pixel_resource_id), &width);
   DCHECK_GT(width, 0);
   return width;
 }
 
 }  // namespace l10n_util