Injected CSS localization fix (see bug no.)

chrome/browser/renderer_host/chrome_render_message_filter.cc

 // Copyright (c) 2011 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.
 
 #include "chrome/browser/renderer_host/chrome_render_message_filter.h"
 
 #include "base/file_util.h"
 #include "base/metrics/histogram.h"
 #include "chrome/browser/automation/automation_resource_message_filter.h"
 #include "chrome/browser/browser_process.h"
@@ skipping 305 matching lines @@
           extension_path, extension_id, default_locale, reply_msg));
 }
 
 void ChromeRenderMessageFilter::OnGetExtensionMessageBundleOnFileThread(
     const FilePath& extension_path,
     const std::string& extension_id,
     const std::string& default_locale,
     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);
 }
 
 void ChromeRenderMessageFilter::OnExtensionAddListener(
     const std::string& extension_id,
     const std::string& event_name) {
   RenderProcessHost* process = RenderProcessHost::FromID(render_process_id_);
   if (!process || !profile_->GetExtensionEventRouter())
     return;
 
@@ skipping 178 matching lines @@
       reply_msg, url);
 }
 
 void ChromeRenderMessageFilter::OnSetCookie(const IPC::Message& message,
                                             const GURL& url,
                                             const GURL& first_party_for_cookies,
                                             const std::string& cookie) {
   AutomationResourceMessageFilter::SetCookiesForUrl(
       render_process_id_, message.routing_id(), url, cookie);
 }