Adding @@extension_id reserved message to l10n message map for extension....

chrome/browser/renderer_host/resource_message_filter.cc

Index: chrome/browser/renderer_host/resource_message_filter.cc
===================================================================
--- chrome/browser/renderer_host/resource_message_filter.cc	(revision 39251)
+++ chrome/browser/renderer_host/resource_message_filter.cc	(working copy)
@@ -1359,11 +1359,12 @@
       ChromeThread::FILE, FROM_HERE,
       NewRunnableMethod(
           this, &ResourceMessageFilter::OnGetExtensionMessageBundleOnFileThread,
-          extension_path, default_locale, reply_msg));
+          extension_path, extension_id, default_locale, reply_msg));
 }
 
 void ResourceMessageFilter::OnGetExtensionMessageBundleOnFileThread(
     const FilePath& extension_path,
+    const std::string& extension_id,
     const std::string& default_locale,
     IPC::Message* reply_msg) {
   DCHECK(ChromeThread::CurrentlyOn(ChromeThread::FILE));
@@ -1380,6 +1381,11 @@
       dictionary_map = *bundle->dictionary();
   }
 
+  // Add @@extension_id reserved message here, so it's available to
+  // non-localized extensions too.
+  dictionary_map.insert(
+      std::make_pair(ExtensionMessageBundle::kExtensionIdKey, extension_id));
+
   ViewHostMsg_GetExtensionMessageBundle::WriteReplyParams(
       reply_msg, dictionary_map);