[ui/base;css] adding string template expression replacement

ui/base/webui/web_ui_util.cc

 // Copyright 2013 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/webui/web_ui_util.h"
 
 #include <vector>
 
 #include "base/base64.h"
 #include "base/i18n/rtl.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted_memory.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/trace_event/trace_event.h"
 #include "net/base/escape.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
+#include "ui/base/template_expressions.h"
 #include "ui/base/window_open_disposition.h"
 #include "ui/gfx/codec/png_codec.h"
 #include "ui/gfx/font.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/resources/grit/webui_resources.h"
 #include "ui/strings/grit/app_locale_settings.h"
 #include "url/gurl.h"
 
 #if defined(OS_WIN)
 #include "base/win/windows_version.h"
@@ skipping 83 matching lines @@
 
 void SetLoadTimeDataDefaults(const std::string& app_locale,
                              base::DictionaryValue* localized_strings) {
   localized_strings->SetString("fontfamily", GetFontFamily());
   localized_strings->SetString("fontsize", GetFontSize());
   localized_strings->SetString("language", l10n_util::GetLanguage(app_locale));
   localized_strings->SetString("textdirection", GetTextDirection());
 }
 
 std::string GetWebUiCssTextDefaults() {
-  std::vector<std::string> placeholders;
-  placeholders.push_back(GetTextDirection());  // $1
-  placeholders.push_back(GetFontFamily());  // $2
-  placeholders.push_back(GetFontSize());  // $3
+  std::map<base::StringPiece, std::string> placeholders;
+  placeholders["textDirection"] = GetTextDirection();
+  placeholders["fontFamily"] = GetFontFamily();
+  placeholders["fontSize"] = GetFontSize();
 
   const ui::ResourceBundle& resource_bundle =
       ui::ResourceBundle::GetSharedInstance();
   const std::string& css_template =
       resource_bundle.GetRawDataResource(IDR_WEBUI_CSS_TEXT_DEFAULTS)
           .as_string();
 
-  return base::ReplaceStringPlaceholders(css_template, placeholders, nullptr);
+  return ui::ReplaceTemplateExpressions(css_template, placeholders);
 }
 
 void AppendWebUiCssTextDefaults(std::string* html) {
   html->append("<style>");
   html->append(GetWebUiCssTextDefaults());
   html->append("</style>");
 }
 
 std::string GetFontFamily() {
   std::string font_family = l10n_util::GetStringUTF8(
@@ skipping 20 matching lines @@
           IDS_WEB_FONT_SIZE_XP :
 #endif
           IDS_WEB_FONT_SIZE);
 }
 
 std::string GetTextDirection() {
   return base::i18n::IsRTL() ? "rtl" : "ltr";
 }
 
 }  // namespace webui