[MD Bookmarks] Support elision of bookmark names in the bookmark toast.

ui/webui/resources/js/load_time_data.js

 // 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.
 
 /**
  * @fileoverview This file defines a singleton which provides access to all data
  * that is available as soon as the page's resources are loaded (before DOM
  * content has finished loading). This data includes both localized strings and
  * any data that is important to have ready from a very early stage (e.g. things
  * that must be displayed right away).
@@ skipping 69 matching lines @@
      * @param {string} id The ID of the string we want.
      * @param {...(string|number)} var_args The extra values to include in the
      *     formatted output.
      * @return {string} The formatted string.
      */
     getStringF: function(id, var_args) {
       var value = this.getString(id);
       if (!value)
         return '';
 
+      var args = Array.prototype.slice.call(arguments);
+      args[0] = value;
+      return this.substituteString.apply(this, args);
+    },
+
+    /**
+     * Returns a formatted localized string where $1 to $9 are replaced by the
+     * second to the tenth argument. Any standalone $ signs must be escaped as
+     * $$.
+     * @param {string} label The label to substitute through.
+     *     This is not an resource ID.
+     * @param {...(string|number)} var_args The extra values to include in the
+     *     formatted output.
+     * @return {string} The formatted string.
+     */
+    substituteString: function(label, var_args) {
       var varArgs = arguments;
-      return value.replace(/\$[$1-9]/g, function(m) {
+      return label.replace(/\$(.|$)/g, function(m) {

[hirono, 2017/06/09 01:02:21]

/\$(.|$)/g does not match something like "$\nHi!".
Maybe /\$(.|$|\n)/g or /\$(.|$)/gm ?

[calamity, 2017/06/09 05:55:23]

I'm not aware of any multiline strings.

Either way, fixed.

+        assert(m.match(/\$[$1-9]/), 'Unescaped $ found in localized string.');
         return m == '$$' ? '$' : varArgs[m[1]];
       });
     },
 
     /**
+     * Returns a formatted string where $1 to $9 are replaced by the second to
+     * tenth argument, split apart into a list of pieces describing how the
+     * substitution was performed. Any standalone $ signs must be escaped as $$.
+     * @param {string} label A localized string to substitute through.
+     *     This is not an resource ID.
+     * @param {...(string|number)} var_args The extra values to include in the
+     *     formatted output.
+     * @return {!Array<!{value: string, arg: (null|string)}>} The formatted
+     *     string pieces.
+     */
+    getSubstitutedStringPieces: function(label, var_args) {
+      var varArgs = arguments;
+      // Split the string by separately matching all occurrences of $1-9 and of
+      // non $1-9 pieces.
+      var pieces = (label.match(/(\$[1-9])|(([^$]|\$([^1-9]|$))+)/g) ||

[hirono, 2017/06/09 01:02:21]

nit & optional: (label ? label.split(/(\$[1-9])/) : []).map(...) may be simpler.

[calamity, 2017/06/09 05:55:23]

This won't work for $$60 which I'd expect to render as $60, rather than $, $6,
0. The tests check this case.

[hirono, 2017/06/09 06:01:25]

That's true!

+                    []).map(function(p) {
+        // Pieces that are not $1-9 should be returned after replacing $$
+        // with $.
+        if (!p.match(/^\$[1-9]$/)) {
+          assert(
+              (p.match(/\$/g) || []).length % 2 == 0,
+              'Unescaped $ found in localized string.');
+          return {value: p.replace(/\$\$/g, '$'), arg: null};
+        }
+
+        // Otherwise, return the substitution value.
+        return {value: varArgs[p[1]], arg: p};
+      });
+
+      return pieces;
+    },
+
+    /**
      * As above, but also makes sure that the value is a boolean.
      * @param {string} id The key that identifies the desired boolean.
      * @return {boolean} The corresponding boolean value.
      */
     getBoolean: function(id) {
       var value = this.getValue(id);
       expectIsType(id, value, 'boolean');
       return /** @type {boolean} */ (value);
     },
 
@@ skipping 42 matching lines @@
    * @param {string} type The type we expect |value| to be.
    */
   function expectIsType(id, value, type) {
     expect(
         typeof value == type, '[' + value + '] (' + id + ') is not a ' + type);
   }
 
   expect(!loadTimeData, 'should only include this file once');
   loadTimeData = new LoadTimeData;
 })();