From e2b56436aa3784f9a1bdf506b1430f68f2ec49eb Mon Sep 17 00:00:00 2001 From: "brg@chromium.com" Date: Tue, 12 May 2009 19:34:53 +0000 Subject: Re-enable test after fix for valgrind/purify error. The fix was submitted in issue 79049. http://crbug.com/10679 Review URL: http://codereview.chromium.org/115202 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15889 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/importer/toolbar_importer.h | 2 +- chrome/browser/importer/toolbar_importer_unittest.cc | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/chrome/browser/importer/toolbar_importer.h b/chrome/browser/importer/toolbar_importer.h index a291476..24b5b28 100644 --- a/chrome/browser/importer/toolbar_importer.h +++ b/chrome/browser/importer/toolbar_importer.h @@ -58,7 +58,7 @@ class Toolbar5Importer : public URLFetcher::Delegate, public Importer { const std::string& data); private: - FRIEND_TEST(Toolbar5ImporterTest, DISABLED_BookmarkParse); + FRIEND_TEST(Toolbar5ImporterTest, BookmarkParse); // Internal states of the toolbar importer. enum InternalStateEnum { diff --git a/chrome/browser/importer/toolbar_importer_unittest.cc b/chrome/browser/importer/toolbar_importer_unittest.cc index ab2b46d..1d4a2ac 100644 --- a/chrome/browser/importer/toolbar_importer_unittest.cc +++ b/chrome/browser/importer/toolbar_importer_unittest.cc @@ -309,8 +309,7 @@ static const char* kBadBookmarkNoLabels = // The parsing tests for Toolbar5Importer use the string above. For a // description of all the tests run please see the comments immediately before // the string constants above. -// Failing Valgrind/Purify, refer to http://crbug.com/10679 -TEST(Toolbar5ImporterTest, DISABLED_BookmarkParse) { +TEST(Toolbar5ImporterTest, BookmarkParse) { XmlReader reader; std::string bookmark_xml; std::vector bookmarks; -- cgit v1.1