Fix Manifest leak in Extension::InitFromValue.

Extension::InitFromValue was leaking Manifest objects when returning early from error conditions.

BUG=106331
TEST=existing

Review URL: http://codereview.chromium.org/8805010

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@113024 0039d316-1c4b-4281-b951-d872f2087c98

chrome/common/extensions/extension.cc

@@ -1385,6 +1385,7 @@ bool Extension::InitFromValue(extensions::Manifest* manifest, int flags,
                               std::string* error) {
   DCHECK(error);
   base::AutoLock auto_lock(runtime_data_lock_);
+  manifest_.reset(manifest);
 
   if (!manifest->ValidateManifest(error))
     return false;
@@ -1446,8 +1447,6 @@ bool Extension::InitFromValue(extensions::Manifest* manifest, int flags,
 
   creation_flags_ = flags;
 
-  manifest_.reset(manifest);
-
   // Initialize the URL.
   extension_url_ = Extension::GetBaseURLFromExtensionId(id());
 

tools/heapcheck/suppressions.txt

@@ -1785,30 +1785,3 @@
    fun:AccessibilityEventRouterViewsTest::CreateWindowWithContents
    fun:AccessibilityEventRouterViewsTest_TestFocusNotification_Test::TestBody
 }
-{
-   bug_106331_a
-   Heapcheck:Leak
-   ...
-   fun:Extension::Create
-}
-{
-   bug_106331_b
-   Heapcheck:Leak
-   ...
-   fun:ExtensionUnpacker::ReadManifest
-   fun:ExtensionUnpacker::Run
-}
-{
-   bug_106331_c
-   Heapcheck:Leak
-   ...
-   fun:JSONFileValueSerializer::Deserialize
-   fun:::FileThreadDeserializer::DoReading
-   fun:JsonPrefStore::ReadPrefs
-   fun:PrefService::InitFromStorage
-   fun:PrefService*
-   fun:PrefServiceMockBuilder::Create
-   fun:ExtensionServiceTestBase::InitializeExtensionService
-   fun:ExtensionServiceTestBase::InitializeInstalledExtensionService
-   fun:ExtensionServiceTest_UninstallingNotLoadedExtension_Test::TestBody
-}

tools/valgrind/memcheck/suppressions.txt

@@ -5322,12 +5322,6 @@
    fun:_ZN7WebCoreL21executeInsertFragmentEPNS_5FrameEN3WTF10PassRefPtrINS_16DocumentFragmentEEE
    fun:_ZN7WebCoreL17executeInsertHTMLEPNS_5FrameEPNS_5EventENS_19EditorCommandSourceERKN3WTF6StringE
 }
-{
-   bug_106331
-   Memcheck:Leak
-   ...
-   fun:_ZN9Extension6CreateERK8FilePathNS_8LocationERKN4base15DictionaryValueEiPSs
-}
 {
    bug_106402
    Memcheck:Leak