Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(587)

Unified Diff: chrome/browser/chromeos/login/login_utils_browsertest.cc

Issue 292703004: Reenable two LoginUtilTests and add suppression. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | tools/lsan/suppressions.txt » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/login/login_utils_browsertest.cc
diff --git a/chrome/browser/chromeos/login/login_utils_browsertest.cc b/chrome/browser/chromeos/login/login_utils_browsertest.cc
index f0c2dc8c2ff2b1f1639ee1e457534d1d8d8b2347..ccb2505648a3284beed8f4d6c5883bea180d278d 100644
--- a/chrome/browser/chromeos/login/login_utils_browsertest.cc
+++ b/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());
« no previous file with comments | « no previous file | tools/lsan/suppressions.txt » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698