Valgrind suppression updates for Mac UI bots

Moves a suppression to the Mac file and adds another flavor of it. Adds a suppression for a leak in the same are of the code.

BUG=20580,20837
TEST=Watch the Mac UI valgrind bots for signs of green

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

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

2 files changed, 58 insertions, 14 deletions

diff --git a/tools/valgrind/memcheck/suppressions.txt b/tools/valgrind/memcheck/suppressions.txt
index 1eb247d..89556a8 100644
--- a/tools/valgrind/memcheck/suppressions.txt
+++ b/tools/valgrind/memcheck/suppressions.txt
@@ -1066,20 +1066,6 @@
    fun:gtk_accel_label_destroy
 }
 {
-   bug_20580
-   Memcheck:Addr1
-   fun:syncJournal
-   fun:sqlite3PagerCommitPhaseOne
-   fun:sqlite3BtreeCommitPhaseOne
-   fun:vdbeCommit
-   fun:sqlite3VdbeHalt
-   fun:sqlite3VdbeExec
-   fun:sqlite3Step
-   fun:sqlite3_step
-   fun:sqlite3_exec
-   fun:_ZN7history16ArchivedDatabase17CommitTransactionEv
-}
-{
    bug_20581
    Memcheck:Leak
    ...
diff --git a/tools/valgrind/memcheck/suppressions_mac.txt b/tools/valgrind/memcheck/suppressions_mac.txt
index 8b067ef..15a7e9a 100644
--- a/tools/valgrind/memcheck/suppressions_mac.txt
+++ b/tools/valgrind/memcheck/suppressions_mac.txt
@@ -613,3 +613,61 @@
    fun:_ZN5NPAPI12_GLOBAL__N_117ReadSTRPluginInfoERK8FilePathP10__CFBundleP13WebPluginInfo
    fun:_ZN5NPAPI9PluginLib17ReadWebPluginInfoERK8FilePathP13WebPluginInfo
 }
+{
+   bug_20580
+   Memcheck:Addr1
+   fun:syncJournal
+   fun:sqlite3PagerCommitPhaseOne
+   fun:sqlite3BtreeCommitPhaseOne
+   fun:vdbeCommit
+   fun:sqlite3VdbeHalt
+   fun:sqlite3VdbeExec
+   fun:sqlite3Step
+   fun:sqlite3_step
+   fun:sqlite3_exec
+   fun:_ZN7history16ArchivedDatabase17CommitTransactionEv
+}
+{
+   bug_20580_b
+   Memcheck:Addr4
+   ...
+   fun:sqlite3BitvecDestroy
+   fun:pager_end_transaction
+   fun:sqlite3PagerCommitPhaseTwo
+   fun:sqlite3BtreeCommitPhaseTwo
+   fun:vdbeCommit
+   fun:sqlite3VdbeHalt
+   fun:sqlite3VdbeExec
+   fun:sqlite3Step
+   fun:sqlite3_step
+   fun:sqlite3_exec
+   fun:_ZN7history16ArchivedDatabase17CommitTransactionEv
+   fun:_ZN7history16ArchivedDatabase4InitERK8FilePath
+}
+{
+   bug_20837
+   Memcheck:Leak
+   fun:malloc
+   fun:sqlite3MemMalloc
+   fun:mallocWithAlarm
+   fun:sqlite3Malloc
+   fun:sqlite3DbMallocRaw
+   fun:sqlite3DbStrNDup
+   fun:sqlite3NameFromToken
+   fun:sqlite3StartTable
+   fun:yy_reduce
+   fun:sqlite3Parser
+   fun:sqlite3RunParser
+   fun:sqlite3Prepare
+   fun:sqlite3LockAndPrepare
+   fun:sqlite3_prepare
+   fun:sqlite3_exec
+   fun:sqlite3InitCallback
+   fun:sqlite3_exec
+   fun:sqlite3VdbeExec
+   fun:sqlite3Step
+   fun:sqlite3_step
+   fun:sqlite3_exec
+   fun:_ZN7history11URLDatabase27InitKeywordSearchTermsTableEv
+   fun:_ZN7history16ArchivedDatabase4InitERK8FilePath
+}