Merge 34968 - Fix memory leak on ExtensionMessageBundle....

chrome/common/extensions/extension_l10n_util.cc

Index: chrome/common/extensions/extension_l10n_util.cc
===================================================================
--- chrome/common/extensions/extension_l10n_util.cc	(revision 35597)
+++ chrome/common/extensions/extension_l10n_util.cc	(working copy)
@@ -122,15 +122,15 @@
 
   std::string default_locale = GetDefaultLocaleFromManifest(*manifest, error);
 
-  ExtensionMessageBundle* message_bundle =
-      extension_file_util::LoadExtensionMessageBundle(extension->path(),
-                                                      default_locale,
-                                                      error);
+  scoped_ptr<ExtensionMessageBundle> message_bundle(
+      extension_file_util::LoadExtensionMessageBundle(
+          extension->path(), default_locale, error));
 
-  if (!message_bundle && !error->empty())
+  if (!message_bundle.get() && !error->empty())
     return false;
 
-  if (message_bundle && !LocalizeManifest(*message_bundle, manifest, error))
+  if (message_bundle.get() &&
+      !LocalizeManifest(*message_bundle, manifest, error))
     return false;
 
   return true;