Don't replace $1 with an empty string when localizing string for host plugin.

Previously chrome.l18n.getString() wouldn't touch $1 within the resource
when substitutions are not specified. This was fixed in crrev.com/141280, and
now it replaced $1 with an empty strings, which broke chromoting host
localization that relied on the previous incorrect behaviour. Fixed
the webapp to correctly handle strings substitutions.

BUG=132146

Review URL: https://chromiumcodereview.appspot.com/10533101

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@141804 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 10 insertions, 1 deletions

diff --git a/remoting/webapp/host_session.js b/remoting/webapp/host_session.js
index d1f9a14..fb064e5 100644
--- a/remoting/webapp/host_session.js
+++ b/remoting/webapp/host_session.js
@@ -72,7 +72,16 @@ remoting.HostSession.prototype.createPluginAndConnect =
   this.plugin.onNatTraversalPolicyChanged = onNatTraversalPolicyChanged;
   this.plugin.onStateChanged = onStateChanged;
   this.plugin.logDebugInfo = logDebugInfo;
-  this.plugin.localize(chrome.i18n.getMessage);
+  this.plugin.localize(
+      /** @param {string} id */
+      function(id) {
+          // Plugin takes care of string substitution, so we just keep
+          // $ placeholders.
+          // TODO(sergeyu): Refactor plugin location so that it
+          // doesn't need to do any substitutions. crbug.com/132370 .
+          return chrome.i18n.getMessage(id, ["$1", "$2", "$3"]);
+      }
+  );
   this.plugin.connect(email, 'oauth2:' + accessToken);
 };