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

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

Issue 10837234: Re-enable login tests under ASAN (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 4 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 | chrome/browser/ui/webui/options2/chromeos/guest_mode_options_ui_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/login/existing_user_controller_browsertest.cc
diff --git a/chrome/browser/chromeos/login/existing_user_controller_browsertest.cc b/chrome/browser/chromeos/login/existing_user_controller_browsertest.cc
index cbbb56f9144582b505d1a81c91f39114ea4d8906..6b8b70161d2d81cd40fad8baad0b3e7a97508ced 100644
--- a/chrome/browser/chromeos/login/existing_user_controller_browsertest.cc
+++ b/chrome/browser/chromeos/login/existing_user_controller_browsertest.cc
@@ -232,19 +232,7 @@ scoped_refptr<Authenticator> CreateAuthenticatorNewUser(
return new MockAuthenticator(consumer, kNewUsername, kPassword);
}
-// These tests are failing under ASan, but not natively.
-// See http://crbug.com/126224
-#if defined(ADDRESS_SANITIZER)
-#define MAYBE_ExistingUserLogin DISABLED_ExistingUserLogin
-#define MAYBE_AutoEnrollAfterSignIn DISABLED_AutoEnrollAfterSignIn
-#define MAYBE_NewUserDontAutoEnrollAfterSignIn \
- DISABLED_NewUserDontAutoEnrollAfterSignIn
-#else
-#define MAYBE_ExistingUserLogin ExistingUserLogin
-#define MAYBE_AutoEnrollAfterSignIn AutoEnrollAfterSignIn
-#define MAYBE_NewUserDontAutoEnrollAfterSignIn NewUserDontAutoEnrollAfterSignIn
-#endif // defined(ADDRESS_SANITIZER)
-IN_PROC_BROWSER_TEST_F(ExistingUserControllerTest, MAYBE_ExistingUserLogin) {
+IN_PROC_BROWSER_TEST_F(ExistingUserControllerTest, ExistingUserLogin) {
EXPECT_CALL(*mock_login_display_, SetUIEnabled(false))
.Times(1);
EXPECT_CALL(*mock_login_utils_, CreateAuthenticator(_))
@@ -273,8 +261,7 @@ IN_PROC_BROWSER_TEST_F(ExistingUserControllerTest, MAYBE_ExistingUserLogin) {
content::RunAllPendingInMessageLoop();
}
-IN_PROC_BROWSER_TEST_F(ExistingUserControllerTest,
- MAYBE_AutoEnrollAfterSignIn) {
+IN_PROC_BROWSER_TEST_F(ExistingUserControllerTest, AutoEnrollAfterSignIn) {
EXPECT_CALL(*mock_login_display_host_,
StartWizard(WizardController::kEnterpriseEnrollmentScreenName, _))
.Times(1);
@@ -291,7 +278,7 @@ IN_PROC_BROWSER_TEST_F(ExistingUserControllerTest,
}
IN_PROC_BROWSER_TEST_F(ExistingUserControllerTest,
- MAYBE_NewUserDontAutoEnrollAfterSignIn) {
+ NewUserDontAutoEnrollAfterSignIn) {
EXPECT_CALL(*mock_login_display_host_,
StartWizard(WizardController::kEnterpriseEnrollmentScreenName, _))
.Times(0);
« no previous file with comments | « no previous file | chrome/browser/ui/webui/options2/chromeos/guest_mode_options_ui_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698