Actually fix memory leak in ExtensionSettingsStorageQuotaEnforcer.

Original patch by kalman@chromium.org.

BUG=97511
TEST=
TBR=kalman@chromium.org

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

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

chrome/browser/extensions/extension_settings_storage_quota_enforcer.h

@@ -40,7 +40,7 @@ class ExtensionSettingsStorageQuotaEnforcer : public ExtensionSettingsStorage {
   size_t const max_keys_;
 
   // The delegate storage area.
-  ExtensionSettingsStorage* const delegate_;
+  scoped_ptr<ExtensionSettingsStorage> const delegate_;
 
   // Total size of the settings currently being used.  Includes both settings
   // keys and their JSON-encoded values.

tools/heapcheck/suppressions.txt

@@ -1687,12 +1687,6 @@
    fun:sync_notifier::NonBlockingInvalidationNotifier::Core::UpdateCredentials
    fun:void DispatchToMethod
 }
-{
-   bug_97511_a
-   Heapcheck:Leak
-   ...
-   fun:ExtensionSettingsQuotaUnittest*
-}
 {
    bug_97511_b
    Heapcheck:Leak

tools/valgrind/memcheck/suppressions.txt

@@ -4622,29 +4622,6 @@
    fun:vorbis_decode_frame
    fun:avcodec_decode_audio3
 }
-{
-   bug_97511_a
-   Memcheck:Leak
-   fun:_Znw*
-   fun:_ZN30ExtensionSettingsQuotaUnittestC2Ev
-   fun:_ZN*ExtensionSettingsQuotaUnittest_*
-}
-{
-   bug_97511_b
-   Memcheck:Leak
-   fun:_Znw*
-   fun:_ZN9__gnu_cxx13new_allocatorISt13_Rb_tree_nodeISt4pairIKSsPN4base5ValueEEEE8allocateE*
-   fun:_ZNSt8_Rb_treeISsSt4pairIKSsPN4base5ValueEESt10_Select1stIS5_ESt4lessISsESaIS5_EE11_M_get_nodeEv
-   fun:_ZNSt8_Rb_treeISsSt4pairIKSsPN4base5ValueEESt10_Select1stIS5_ESt4lessISsESaIS5_EE*
-   ...
-   fun:_ZNSt3mapISsPN4base5ValueESt4lessISsESaISt4pairIKSsS2_EEE6insertESt17_Rb_tree_iteratorIS7_ERKS7_
-   fun:_ZNSt3mapISsPN4base5ValueESt4lessISsESaISt4pairIKSsS2_EEEixERS6_
-   fun:_ZN4base15DictionaryValue23SetWithoutPathExpansionERKSsPNS_5ValueE
-   fun:_ZN4base15DictionaryValue15MergeDictionaryEPKS0_
-   fun:_ZN29ExtensionSettingsStorageCache3Set*
-   ...
-   fun:_ZN*ExtensionSettingsQuotaUnittest_*
-}
 {
    bug_97511_c
    Memcheck:Leak