[MD settings] i18n template replacements in shared HTML resources

chrome/browser/ui/webui/options/options_ui.cc

Index: chrome/browser/ui/webui/options/options_ui.cc
diff --git a/chrome/browser/ui/webui/options/options_ui.cc b/chrome/browser/ui/webui/options/options_ui.cc
index b6ffe6efe463af5e3a7adca3919934e7234fc0ba..aa716c97400d59420d7bcf6ab9d73aeaaee6c960 100644
--- a/chrome/browser/ui/webui/options/options_ui.cc
+++ b/chrome/browser/ui/webui/options/options_ui.cc
@@ -175,7 +175,6 @@ class OptionsUIHTMLSource : public content::URLDataSource {
  private:
   ~OptionsUIHTMLSource() override;
   void CreateDataSourceMap();
-  void AddReplacements(base::DictionaryValue* localized_strings);
 
   // Localized strings collection.
   std::unique_ptr<base::DictionaryValue> localized_strings_;
@@ -188,7 +187,6 @@ class OptionsUIHTMLSource : public content::URLDataSource {
 OptionsUIHTMLSource::OptionsUIHTMLSource(
     base::DictionaryValue* localized_strings) {
   DCHECK(localized_strings);
-  AddReplacements(localized_strings);
   localized_strings_.reset(localized_strings);
   CreateDataSourceMap();
 }
@@ -204,6 +202,8 @@ void OptionsUIHTMLSource::StartDataRequest(
   scoped_refptr<base::RefCountedMemory> response_bytes;
   const std::string& app_locale = g_browser_process->GetApplicationLocale();
   webui::SetLoadTimeDataDefaults(app_locale, localized_strings_.get());
+  ui::TemplateReplacementsFromDictionaryValue(*(localized_strings_.get()),

[Dan Beam, 2017/01/04 22:41:20]

nit: just *localized_strings_

[dschuyler, 2017/01/04 23:18:29]

Done.

+                                              &replacements_);
 
   std::map<std::string, int>::iterator result;
   result = path_to_idr_map_.find(path);
@@ -287,18 +287,6 @@ void OptionsUIHTMLSource::CreateDataSourceMap() {
 #endif
 }
 
-void OptionsUIHTMLSource::AddReplacements(
-    base::DictionaryValue* localized_strings) {
-  for (auto it = base::DictionaryValue::Iterator(*localized_strings);
-       !it.IsAtEnd(); it.Advance()) {
-    std::string str_value;
-    if (!it.value().GetAsString(&str_value)) {
-      continue;
-    }
-    replacements_[it.key()] = str_value;
-  }
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 //
 // OptionsPageUIHandler