Injected CSS localization fix (see bug no.)

chrome/browser/renderer_host/chrome_render_message_filter.cc

Index: chrome/browser/renderer_host/chrome_render_message_filter.cc
diff --git a/chrome/browser/renderer_host/chrome_render_message_filter.cc b/chrome/browser/renderer_host/chrome_render_message_filter.cc
index 5cc12936ca325bae200dd1f2832ab997aa4d0cb2..7486ebd2242f46236cbee8e5ddd8f16e04d9c707 100644
--- a/chrome/browser/renderer_host/chrome_render_message_filter.cc
+++ b/chrome/browser/renderer_host/chrome_render_message_filter.cc
@@ -323,25 +323,14 @@ void ChromeRenderMessageFilter::OnGetExtensionMessageBundleOnFileThread(
     IPC::Message* reply_msg) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
 
-  std::map<std::string, std::string> dictionary_map;
-  if (!default_locale.empty()) {
-    // Touch disk only if extension is localized.
-    std::string error;
-    scoped_ptr<ExtensionMessageBundle> bundle(
-        extension_file_util::LoadExtensionMessageBundle(
-            extension_path, default_locale, &error));
-
-    if (bundle.get())
-      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));
+  scoped_ptr<ExtensionMessageBundle::SubstitutionMap> dictionary_map(
+      extension_file_util::LoadExtensionMessageBundleSubstitutionMap(
+          extension_path,
+          extension_id,
+          default_locale));
 
   ExtensionHostMsg_GetMessageBundle::WriteReplyParams(
-      reply_msg, dictionary_map);
+      reply_msg, *dictionary_map);
   Send(reply_msg);
 }