Prepare to enable icu_use_data_file_flat on CrOS

ui/base/resource/resource_bundle.cc

Index: ui/base/resource/resource_bundle.cc
diff --git a/ui/base/resource/resource_bundle.cc b/ui/base/resource/resource_bundle.cc
index 2cfe06cc11c2a7ecf6b81a1f75ed8508c781de1e..54441cf9ab37694ab6590791f9432447f30e9c28 100644
--- a/ui/base/resource/resource_bundle.cc
+++ b/ui/base/resource/resource_bundle.cc
@@ -69,13 +69,13 @@ ResourceBundle* g_shared_instance_ = NULL;
 void InitDefaultFontList() {
 #if defined(OS_CHROMEOS)
   gfx::FontList::SetDefaultFontDescription(
-      l10n_util::GetStringUTF8(IDS_UI_FONT_FAMILY_CROS));
+      l10n_util::GetStringUTF8Raw(IDS_UI_FONT_FAMILY_CROS));

[tony, 2014/01/28 00:32:47]

Can we call:
ResourceBundle& rb = ResourceBundle::GetSharedInstance();
rb.GetLocalizedString(IDS_UI_FONT_FAMILY_CROS);

instead of adding to the l10n_util API?

 
   // TODO(yukishiino): Remove SetDefaultFontDescription() once the migration to
   // the font list is done.  We will no longer need SetDefaultFontDescription()
   // after every client gets started using a FontList instead of a Font.
   gfx::PlatformFontPango::SetDefaultFontDescription(
-      l10n_util::GetStringUTF8(IDS_UI_FONT_FAMILY_CROS));
+      l10n_util::GetStringUTF8Raw(IDS_UI_FONT_FAMILY_CROS));
 #else
   // Use a single default font as the default font list.
   gfx::FontList::SetDefaultFontDescription(std::string());