Re-enable login tests under ASAN

BUG=126224
TEST=tests pass under ASAN locally and on try bots


Review URL: https://chromiumcodereview.appspot.com/10837234

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

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);

chrome/browser/ui/webui/options2/chromeos/guest_mode_options_ui_browsertest.cc

@@ -20,13 +20,7 @@ class GuestModeOptionsBrowserTest : public options2::OptionsBrowserTest {
   }
 };
 
-// See http://crbug.com/126224
-#if defined(ADDRESS_SANITIZER)
-#define MAYBE_LoadOptionsByURL DISABLED_LoadOptionsByURL
-#else
-#define MAYBE_LoadOptionsByURL LoadOptionsByURL
-#endif  // defined(ADDRESS_SANITIZER)
-IN_PROC_BROWSER_TEST_F(GuestModeOptionsBrowserTest, MAYBE_LoadOptionsByURL) {
+IN_PROC_BROWSER_TEST_F(GuestModeOptionsBrowserTest, LoadOptionsByURL) {
   NavigateToSettings();
   VerifyTitle();
   VerifyNavbar();