From a46fe070a39cb93d6a4d5be96e3058486726f856 Mon Sep 17 00:00:00 2001
From: "eugenis@chromium.org"
 <eugenis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Tue, 25 Jun 2013 13:28:06 +0000
Subject: [PATCH] Revert revert r208429.

Disable AutofillQueryXmlParserTest.ParseAutofillFlow when
defined(ADDRESS_SANITIZER), instead of defined(OS_LINUX).

Also add Valgrind suppresion for this test.

BUG=253797
TBR=hashimoto,blundell

Review URL: https://codereview.chromium.org/17666002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@208481 0039d316-1c4b-4281-b951-d872f2087c98
---
 .../core/browser/autofill_xml_parser_unittest.cc      |  4 ++--
 tools/valgrind/memcheck/suppressions.txt              | 19 ++++++++++++++++++-
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/components/autofill/core/browser/autofill_xml_parser_unittest.cc b/components/autofill/core/browser/autofill_xml_parser_unittest.cc
index 102332374a4d..2cfc0a3ae8b9 100644
--- a/components/autofill/core/browser/autofill_xml_parser_unittest.cc
+++ b/components/autofill/core/browser/autofill_xml_parser_unittest.cc
@@ -165,8 +165,8 @@ TEST_F(AutofillQueryXmlParserTest, ParseExperimentId) {
   EXPECT_EQ("ServerSmartyPants", experiment_id_);
 }
 
-// Fails on Linux ASAN bot. http://crbug.com/253797
-#if defined(OS_LINUX)
+// Fails on ASAN bot. http://crbug.com/253797
+#if defined(ADDRESS_SANITIZER)
 #define MAYBE_ParseAutofillFlow DISABLED_ParseAutofillFlow
 #else
 #define MAYBE_ParseAutofillFlow ParseAutofillFlow
diff --git a/tools/valgrind/memcheck/suppressions.txt b/tools/valgrind/memcheck/suppressions.txt
index 3cef161ada8a..f34a75e8c373 100644
--- a/tools/valgrind/memcheck/suppressions.txt
+++ b/tools/valgrind/memcheck/suppressions.txt
@@ -7316,6 +7316,24 @@
    fun:_ZN7content12_GLOBAL__N_139LevelDBDatabaseTest_CorruptionTest_Test8TestBodyEv
 }
 {
+   bug_253797
+   Memcheck:Uninitialized
+   fun:_ZNSt11char_traitsIcE6lengthEPKc
+   fun:_ZN4base8internal17StringPieceDetailISsEC1EPKc
+   fun:_ZN4base16BasicStringPieceISsEC1EPKc
+   fun:_ZN8autofill22AutofillQueryXmlParser13CharacterDataEPN4buzz15XmlParseContextEPKci
+   fun:_ZN4buzz9XmlParser18ExpatCharacterDataEPKci
+   fun:_ZN4buzzL21CharacterDataCallbackEPvPKci
+   obj:*libexpat.so*
+   obj:*libexpat.so*
+   obj:*libexpat.so*
+   obj:*libexpat.so*
+   fun:XML_ParseBuffer
+   fun:_ZN4buzz9XmlParser5ParseEPKcmb
+   fun:_ZN8autofill12_GLOBAL__N_126AutofillQueryXmlParserTest13ParseQueryXMLERKSsb
+   fun:_ZN8autofill12_GLOBAL__N_149AutofillQueryXmlParserTest_ParseAutofillFlow_Test8TestBodyEv
+}
+{
    bug_253832
    Memcheck:Leak
    ...
@@ -7324,4 +7342,3 @@
    fun:_ZN3net4test26QuicNetworkTransactionTest32SendRequestAndExpectQuicResponseERKSs
    fun:_ZN3net4test53QuicNetworkTransactionTest_ZeroRTTWithNoHttpRace_Test8TestBodyEv
 }
-
-- 
2.11.4.GIT