Reenable two LoginUtilTests and add suppression.

These were incorrectly disabled after the stack trace for the
suppressions changed.

NOTRY=true
TBR=jyasskin@chromium.org
BUG=361044

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

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

chrome/browser/chromeos/login/login_utils_browsertest.cc

@@ -524,13 +524,7 @@ class LoginUtilsBlockingLoginTest
     : public LoginUtilsTest,
       public testing::WithParamInterface<int> {};
 
-// Test leaks a profile with LSAN enabled. See http://crbug.com/374078.
-#if defined(LEAK_SANITIZER)
-#define MAYBE_NormalLoginDoesntBlock DISABLED_NormalLoginDoesntBlock
-#else
-#define MAYBE_NormalLoginDoesntBlock NormalLoginDoesntBlock
-#endif
-TEST_F(LoginUtilsTest, MAYBE_NormalLoginDoesntBlock) {
+TEST_F(LoginUtilsTest, NormalLoginDoesntBlock) {
   UserManager* user_manager = UserManager::Get();
   EXPECT_FALSE(user_manager->IsUserLoggedIn());
   EXPECT_FALSE(connector_->IsEnterpriseManaged());
@@ -546,15 +540,7 @@ TEST_F(LoginUtilsTest, MAYBE_NormalLoginDoesntBlock) {
   EXPECT_EQ(kUsername, user_manager->GetLoggedInUser()->email());
 }
 
-// Test leaks a profile with LSAN enabled. See http://crbug.com/374078.
-#if defined(LEAK_SANITIZER)
-#define MAYBE_EnterpriseLoginDoesntBlockForNormalUser\
-        DISABLED_EnterpriseLoginDoesntBlockForNormalUser
-#else
-#define MAYBE_EnterpriseLoginDoesntBlockForNormalUser\
-        EnterpriseLoginDoesntBlockForNormalUser
-#endif
-TEST_F(LoginUtilsTest, MAYBE_EnterpriseLoginDoesntBlockForNormalUser) {
+TEST_F(LoginUtilsTest, EnterpriseLoginDoesntBlockForNormalUser) {
   UserManager* user_manager = UserManager::Get();
   EXPECT_FALSE(user_manager->IsUserLoggedIn());
   EXPECT_FALSE(connector_->IsEnterpriseManaged());

tools/lsan/suppressions.txt

@@ -112,8 +112,8 @@ leak:content::SetProcessTitleFromCommandLine
 
 # http://crbug.com/354881
 leak:LoginUtilsBlockingLoginTest_EnterpriseLoginBlocksForEnterpriseUser
-leak:LoginUtilsParamTest
 leak:LoginUtilsTest::SetUp
+leak:LoginUtilsTest::PrepareProfile
 
 # http://crbug.com/371974
 leak:base::ImportantFileWriter::PostWriteTask