Refactor the suppression rule for Bug 42942

tools/valgrind/memcheck/suppressions.txt

 # There are three kinds of suppressions in this file.
 # 1. third party stuff we have no control over
 #
 # 2. intentional unit test errors, or stuff that is somehow a false positive
 # in our own code, or stuff that is so trivial it's not worth fixing
 #
 # 3. Suppressions for real chromium bugs that are not yet fixed.
 # These should all be in chromium's bug tracking system (but a few aren't yet).
 # Periodically we should sweep this file and the bug tracker clean by
 # running overnight and removing outdated bugs/suppressions.
@@ skipping 1965 matching lines @@
    Memcheck:Leak
    fun:_Znw*
    fun:_ZN19TestWebViewDelegate12createWorkerEPN6WebKit8WebFrameEPNS0_15WebWorkerClientE
    fun:_ZN6WebKit19WebWorkerClientImpl24createWorkerContextProxyEPN7WebCore6WorkerE
    fun:_ZN7WebCore18WorkerContextProxy6createEPNS_6WorkerE
    fun:_ZN7WebCore6WorkerC1EPNS_22ScriptExecutionContextE
    fun:_ZN7WebCore6Worker6createERKN3WTF6StringEPNS_22ScriptExecutionContextERi
    fun:_ZN7WebCore8V8Worker19constructorCallbackERKN2v89ArgumentsE
 }
 {
-   bug_42942
+   bug_42942_a
    Memcheck:Leak
    fun:_Znw*
    ...
    fun:_ZN3sql10Connection18GetCachedStatementERKNS_11StatementIDEPKc
    fun:_ZN3sql9MetaTable19PrepareGetStatementEPNS_9StatementEPKc
    fun:_ZN3sql9MetaTable8GetValueEPKcPi
    fun:_ZN3sql9MetaTable26GetCompatibleVersionNumberEv
    ...
    fun:_ZN3net13CookieMonster9InitStoreEv
 }
 {
+   bug_42942_b
+   Memcheck:Leak
+   fun:_Znw*
+   ...
+   fun:_ZN3sql10Connection18GetCachedStatementERKNS_11StatementIDEPKc
+   fun:_ZN3sql9MetaTable19PrepareSetStatementEPNS_9StatementEPKc
+   fun:_ZN3sql9MetaTable8SetValueEPKci
+   fun:_ZN3sql9MetaTable16SetVersionNumberEi
+   ...
+   fun:_ZN3net13CookieMonster9InitStoreEv
+}
+{
    bug_42958_a
    Memcheck:Leak
    fun:malloc
    ...
    fun:_ZN3WTF10fastMallocEj
    fun:_ZN3WTF13FastAllocBasenwEj
    fun:_NPN_RegisterObject
    fun:_ZN7WebCore16ScriptController20windowScriptNPObjectEv
    fun:_ZNK6WebKit12WebFrameImpl12windowObjectEv
    fun:_ZN11webkit_glue13WebPluginImpl23GetWindowScriptNPObjectEv
@@ skipping 497 matching lines @@
    fun:_ZN3net9HttpCache11Transaction5StartEPKNS_15HttpRequestInfoEP14CallbackRunnerI6Tuple1IiEERKNS_11BoundNetLogE
    fun:_ZN17URLRequestHttpJob16StartTransactionEv
    fun:_ZN17URLRequestHttpJob24OnCanGetCookiesCompletedEi
    fun:_ZN17URLRequestHttpJob23AddCookieHeaderAndStartEv
    fun:_ZN17URLRequestHttpJob5StartEv
    fun:_ZN10URLRequest8StartJobEP13URLRequestJob
    fun:_ZN10URLRequest5StartEv
    fun:_ZN10URLFetcher4Core15StartURLRequestEv
 }
 {
-   bug_56359_b
-   Memcheck:Leak
-   fun:_Znw*
-   fun:_ZN3sql10Connection18GetUniqueStatementEPKc
-   fun:_ZN3sql10Connection18GetCachedStatementERKNS_11StatementIDEPKc
-   fun:_ZN3sql9MetaTable19PrepareSetStatementEPNS_9StatementEPKc
-   fun:_ZN3sql9MetaTable8SetValueEPKci
-   fun:_ZN3sql9MetaTable16SetVersionNumberEi
-   fun:_ZN3sql9MetaTable4InitEPNS_10ConnectionEii
-   fun:_ZN27SQLitePersistentCookieStore21EnsureDatabaseVersionEPN3sql10ConnectionE
-   fun:_ZN27SQLitePersistentCookieStore4LoadEPSt6vectorIPN3net13CookieMonster15CanonicalCookieESaIS4_EE
-   fun:_ZN3net13CookieMonster9InitStoreEv
-   fun:_ZN3net13CookieMonster15InitIfNecessaryEv
-   fun:_ZN3net13CookieMonster21GetCookiesWithOptionsERK4GURLRKNS_13CookieOptionsE
-   fun:_ZN17URLRequestHttpJob24OnCanGetCookiesCompletedEi
-   fun:_ZN17URLRequestHttpJob23AddCookieHeaderAndStartEv
-   fun:_ZN17URLRequestHttpJob5StartEv
-   fun:_ZN10URLRequest8StartJobEP13URLRequestJob
-   fun:_ZN10URLRequest5StartEv
-   fun:_ZN10URLFetcher4Core15StartURLRequestEv
-   fun:_Z16DispatchToMethodIN10URLFetcher4CoreEMS1_FvvEEvPT_T0_RK6Tuple0
-   fun:_ZN14RunnableMethodIN10URLFetcher4CoreEMS1_FvvE6Tuple0E3RunEv
-   fun:_ZN11MessageLoop7RunTaskEP4Task
-   fun:_ZN11MessageLoop21DeferOrRunPendingTaskERKNS_11PendingTaskE
-}
-{
    bug_51153
    Memcheck:Leak
    ...
    fun:_ZN7history14HistoryBackend16GetFavIconForURLE13scoped_refptrI17CancelableRequestI14CallbackRunnerI6Tuple5IibS1_I16RefCountedMemoryEb4GURLEEEERKS7_
    fun:_Z16DispatchToMethodIN7history14HistoryBackendEMS1_Fv13scoped_refptrI17CancelableRequestI14CallbackRunnerI6Tuple5IibS2_I16RefCountedMemoryEb4GURLEEEERKS8_ESC_S8_EvPT_T0_RK6Tuple2IT1_T2_E
    fun:_ZN14RunnableMethodIN7history14HistoryBackendEMS1_Fv13scoped_refptrI17CancelableRequestI14CallbackRunnerI6Tuple5IibS2_I16RefCountedMemoryEb4GURLEEEERKS8_E6Tuple2ISC_S8_EE3RunEv
    fun:_ZN11MessageLoop7RunTaskEP4Task
    fun:_ZN11MessageLoop21DeferOrRunPendingTaskERKNS_11PendingTaskE
    fun:_ZN11MessageLoop6DoWorkEv
    fun:_ZN4base18MessagePumpDefault3RunEPNS_11MessagePump8DelegateE
@@ skipping 919 matching lines @@
    fun:_ZN14ProfileManager10GetProfileERK8FilePath
    fun:_ZN14ProfileManager17GetDefaultProfileERK8FilePath
 }
 {
    bug_67142
    Memcheck:Leak
    fun:_Znw*
    fun:_ZN16ChildProcessHost13CreateChannelEv
    fun:_ZN14GpuProcessHost4InitEv
 }