[Template Expressions] changing ${ leader to $i18n{

ui/base/template_expressions.cc

Index: ui/base/template_expressions.cc
diff --git a/ui/base/template_expressions.cc b/ui/base/template_expressions.cc
index 1d63e0c34eac113f386f5a80d5817faa092a5270..f9e5ca9c35919a542dbed04e4dec031b16fa718b 100644
--- a/ui/base/template_expressions.cc
+++ b/ui/base/template_expressions.cc
@@ -12,25 +12,25 @@ namespace ui {
 
 std::string ReplaceTemplateExpressions(
     base::StringPiece format_string,
-    const std::map<base::StringPiece, std::string>& substitutions) {
+    const ReplaceTemplateMap& substitutions) {
+  const char* leader = "$i18n{";

[Dan Beam, 2016/01/20 22:34:38]

const char kLeader[] = "$i18n{";
const size_t kLeaderSize = arraysize(kLeader);

[dschuyler, 2016/01/21 18:43:53]

Done.

   std::string formatted;
   const size_t kValueLengthGuess = 16;
   formatted.reserve(format_string.length() +
                     substitutions.size() * kValueLengthGuess);
   base::StringPiece::const_iterator i = format_string.begin();
   while (i < format_string.end()) {
-    if (*i == '$' && i + 2 < format_string.end() && i[1] == '{' &&
-        i[2] != '}') {
-      size_t key_start = i + strlen("${") - format_string.begin();
+    if (base::StringPiece(i).starts_with(leader)) {
+      size_t key_start = i + strlen(leader) - format_string.begin();

[Dan Beam, 2016/01/20 22:34:38]

can we cache this strlen()?

[dschuyler, 2016/01/21 18:43:53]

Done.

       size_t key_length = format_string.find('}', key_start);
       if (key_length == base::StringPiece::npos)
         NOTREACHED() << "TemplateExpression missing ending brace '}'";
       key_length -= key_start;
-      base::StringPiece key(format_string.begin() + key_start, key_length);
+      std::string key(format_string.begin() + key_start, key_length);
       const auto& replacement = substitutions.find(key);
       if (replacement != substitutions.end()) {
         formatted.append(replacement->second);
-        i += strlen("${") + key_length + strlen("}");
+        i += strlen(leader) + key_length + strlen("}");

[Dan Beam, 2016/01/20 22:34:38]

and re-use the cached strlen here as well?

[dschuyler, 2016/01/21 18:43:53]

Done.

         continue;
       } else {
         NOTREACHED() << "TemplateExpression key not found: " << key;