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

chrome/common/extensions/extension_l10n_util.cc

 // Copyright (c) 2009 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/common/extensions/extension_l10n_util.h"
 
 #include <set>
 #include <string>
 #include <vector>
 
@@ skipping 104 matching lines @@
   return true;
 }
 
 bool LocalizeExtension(Extension* extension,
                        DictionaryValue* manifest,
                        std::string* error) {
   DCHECK(manifest);
 
   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;
 }
 
 bool AddLocale(const std::set<std::string>& chrome_locales,
                const FilePath& locale_folder,
                const std::string& locale_name,
                std::set<std::string>* valid_locales,
                std::string* error) {
@@ skipping 143 matching lines @@
       return false;
     } else {
       catalogs.push_back(catalog);
     }
   }
 
   return ExtensionMessageBundle::Create(catalogs, error);
 }
 
 }  // namespace extension_l10n_util