Update for latest Dr. Memory:

+ update suppressions for new GDI error type
+ update supression pre-submit check for new error types
+ -callstack_modname_hide no longer needs *.exe but it does need
   *drmemorylib* for upcoming -replace_malloc

TBR=rnk@chromium.org
TEST=ran unit_tests VectorCanvasTest.*
BUG=http://code.google.com/p/drmemory/issues/detail?id=953

Review URL: https://chromiumcodereview.appspot.com/10899006

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

3 files changed, 11 insertions, 9 deletions

diff --git a/tools/valgrind/drmemory/suppressions.txt b/tools/valgrind/drmemory/suppressions.txt
index a2100de..38b0bbd 100644
--- a/tools/valgrind/drmemory/suppressions.txt
+++ b/tools/valgrind/drmemory/suppressions.txt
@@ -274,7 +274,7 @@ name=http://crbug.com/101717 (4)
 *!scoped_ptr<_OBJECT_NAME_INFORMATION>::~scoped_ptr<_OBJECT_NAME_INFORMATION>
 *!sandbox::GetPathFromHandle
 
-WARNING
+GDI USAGE ERROR
 name=http://code.google.com/p/drmemory/issues/detail?id=899 deleting bitmap which is probably safe
 system call NtGdiDeleteObjectApp
 *!skia::`anonymous namespace'::Bitmap::~Bitmap
@@ -301,7 +301,7 @@ npapi_test_plugin.dll!NPAPIClient::PluginTest::id
 npapi_test_plugin.dll!NPAPIClient::ExecuteGetJavascriptUrlTest::TimerProc
 
 # Bad GDI teardown sequence.
-WARNING
+GDI USAGE ERROR
 name=http://crbug.com/109963 a
 system call NtGdiDeleteObjectApp
 # usually one or two GDI32.dll frames here but sometimes in light mode
@@ -309,7 +309,7 @@ system call NtGdiDeleteObjectApp
 ...
 *!skia::BitmapPlatformDevice::BitmapPlatformDeviceData::~BitmapPlatformDeviceData
 
-WARNING
+GDI USAGE ERROR
 name=http://crbug.com/109963 b
 system call NtGdiDeleteObjectApp
 # usually one or two GDI32.dll frames here but sometimes in light mode
@@ -318,19 +318,19 @@ system call NtGdiDeleteObjectApp
 *!skia::BitmapPlatformDevice::BitmapPlatformDeviceData::ReleaseBitmapDC
 
 # GDI usage errors in 3rd-party components
-WARNING
+GDI USAGE ERROR
 name=http://crbug.com/119552 a
 system call NtGdiDeleteObjectApp
 ...
 *!OmniboxViewWin::*
 
-WARNING
+GDI USAGE ERROR
 name=http://crbug.com/119552 b
 system call Nt*
 ...
 *!ATL::*
 
-WARNING
+GDI USAGE ERROR
 name=http://crbug.com/119552 c
 # optional gdi32.dll frame followed by user32.dll
 # TODO(bruening): once have
@@ -341,7 +341,7 @@ name=http://crbug.com/119552 c
 shell32.dll!SHGetFileInfoW
 *!IconLoader::ReadIcon
 
-WARNING
+GDI USAGE ERROR
 name=http://crbug.com/119552 d
 system call NtGdiDeleteObjectApp
 gdi32.dll!DeleteObject
@@ -349,7 +349,7 @@ riched20.dll!*
 riched20.dll!*
 riched20.dll!*
 
-WARNING
+GDI USAGE ERROR
 name=http://crbug.com/120157
 # "ReleaseDC called from different thread than GetDC"
 system call NtUserCallOneParam.RELEASEDC
diff --git a/tools/valgrind/suppressions.py b/tools/valgrind/suppressions.py
index ead499b..a1a0d1e 100755
--- a/tools/valgrind/suppressions.py
+++ b/tools/valgrind/suppressions.py
@@ -401,6 +401,8 @@ DRMEMORY_ERROR_TYPES = [
     'UNADDRESSABLE ACCESS',
     'UNINITIALIZED READ',
     'INVALID HEAP ARGUMENT',
+    'GDI USAGE ERROR',
+    'HANDLE LEAK',
     'LEAK',
     'POSSIBLE LEAK',
     'WARNING',
diff --git a/tools/valgrind/valgrind_test.py b/tools/valgrind/valgrind_test.py
index 7309793..b2435e4 100644
--- a/tools/valgrind/valgrind_test.py
+++ b/tools/valgrind/valgrind_test.py
@@ -914,7 +914,7 @@ class DrMemory(BaseTool):
     proc += ["-callstack_srcfile_prefix",
              "build\\src,chromium\\src,crt_build\\self_x86"]
     proc += ["-callstack_modname_hide",
-             "*.exe,chrome.dll"]
+             "*drmemory*,chrome.dll"]
 
     boring_callers = common.BoringCallers(mangled=False, use_re_wildcards=False)
     # TODO(timurrrr): In fact, we want "starting from .." instead of "below .."