From 7008f2227cdf8d5c01ecdcda08b85a6f21c79760 Mon Sep 17 00:00:00 2001
From: "kjellander@webrtc.org" <kjellander@webrtc.org>
Date: Thu, 5 Mar 2015 08:53:12 +0000
Subject: [PATCH] Revert Clang roll in r8596 + add memcheck suppression.

The roll seems to cause leaks on our Linux Memcheck bot.
Added a suppression needed for Trusty in order to run
memcheck similar to the bot (that runs Precise).
Leave all the other source code edits from r8596 in place.

See also http://chromegw/i/client.webrtc/builders/Linux%20Memcheck/builds/3343

TBR=pbos@webrtc.org
TESTED=Can no longer repro memcheck failure with this patch applied:
GYP_DEFINES="build_for_tool=memcheck" webrtc/build/gyp_webrtc
ninja -C out/Release libjingle_peerconnection_unittest
tools/valgrind-webrtc/webrtc_tests.sh --test libjingle_peerconnection_unittest --tool memcheck --target Release --build-dir out  --gtest_filter=WebRtcSessionTest.TestIncorrectMLinesInLocalAnswer

Review URL: https://webrtc-codereview.appspot.com/47419004

Cr-Commit-Position: refs/heads/master@{#8612}
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8612 4adac7df-926f-26a2-2b94-8c16560cd09d
---
 DEPS                                          |  2 +-
 .../valgrind-webrtc/memcheck/suppressions.txt | 25 ++++++++++++++-----
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/DEPS b/DEPS
index 6a678d961..acd57192a 100644
--- a/DEPS
+++ b/DEPS
@@ -6,7 +6,7 @@
 vars = {
   'extra_gyp_flag': '-Dextra_gyp_flag=0',
   'chromium_git': 'https://chromium.googlesource.com',
-  'chromium_revision': '6fdb1425edf17f7b3d55626927d4fddb076a8e31',
+  'chromium_revision': 'e144d30232209034b82d544926070bb8dc62f6ec',
 }
 
 # NOTE: Prefer revision numbers to tags for svn deps. Use http rather than
diff --git a/tools/valgrind-webrtc/memcheck/suppressions.txt b/tools/valgrind-webrtc/memcheck/suppressions.txt
index 1c0236663..276105c75 100644
--- a/tools/valgrind-webrtc/memcheck/suppressions.txt
+++ b/tools/valgrind-webrtc/memcheck/suppressions.txt
@@ -2,13 +2,26 @@
 # It acts as a place holder for future additions for WebRTC.
 # It must exist for the Python wrapper script to work properly.
 
-# There are two kinds of suppressions in this file.
-# 1. webrtc stuff
-#
-# 2. libjingle stuff (talk folder)
+# There are three kinds of suppressions in this file.
+# 1. third_party libraries
+# 2. webrtc stuff
+# 3. libjingle stuff (talk folder)
 #-----------------------------------------------------------------------
 
-# 1. webrtc stuff
+# third_party libraries
+
+{
+   libnss_leak_hitting_trusty_machines
+   Memcheck:Leak
+   fun:calloc
+   obj:/usr/lib/x86_64-linux-gnu/libnss3.so
+   ...
+   fun:NSS_NoDB_Init
+   ...
+}
+
+#-----------------------------------------------------------------------
+# webrtc stuff
 {
    bug_3446
    Memcheck:Uninitialized
@@ -478,7 +491,7 @@
 }
 
 #-----------------------------------------------------------------------
-# 2. libjingle stuff (talk folder)
+# libjingle stuff (talk folder)
 {
    bug_2056_1
    Memcheck:Leak