oobe tests: Add LoginOfflineTest to MSAN filters.

Also cleaned up enrollment_local_policy_server_browsertest Bug: 1099279, 1031275 Change-Id: I87a66aa8f9bf89502a09eb3f2a25734cfd01a53d Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2274414 Auto-Submit: Roman Sorokin [CET] <rsorokin@chromium.org> Commit-Queue: Denis Kuznetsov [CET] <antrim@chromium.org> Reviewed-by: Denis Kuznetsov [CET] <antrim@chromium.org> Cr-Commit-Position: refs/heads/master@{#783889}

oobe tests: Add LoginOfflineTest to MSAN filters.
Also cleaned up enrollment_local_policy_server_browsertest Bug: 1099279, 1031275 Change-Id: I87a66aa8f9bf89502a09eb3f2a25734cfd01a53d Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2274414 Auto-Submit: Roman Sorokin [CET] <rsorokin@chromium.org> Commit-Queue: Denis Kuznetsov [CET] <antrim@chromium.org> Reviewed-by: Denis Kuznetsov [CET] <antrim@chromium.org> Cr-Commit-Position: refs/heads/master@{#783889}
8ba5dd1b · Roman Sorokin · Commit Bot · 4bb040ba · 8ba5dd1b · 8ba5dd1b
Commit 8ba5dd1b authored Jun 30, 2020 by Roman Sorokin Committed by Commit Bot Jun 30, 2020
4 changed files
--- a/chrome/browser/chromeos/login/enrollment/enrollment_local_policy_server_browsertest.cc
+++ b/chrome/browser/chromeos/login/enrollment/enrollment_local_policy_server_browsertest.cc
@@ -248,14 +248,7 @@ class InitialEnrollmentTest : public EnrollmentLocalPolicyServerBase {
 };
 // Simple manual enrollment.
-// TODO(https://crbug.com/1031275): Slow on MSAN and debug builds.
+IN_PROC_BROWSER_TEST_F(EnrollmentLocalPolicyServerBase, ManualEnrollment) {
-#if defined(MEMORY_SANITIZER)
-#define MAYBE_ManualEnrollment DISABLED_ManualEnrollment
-#else
-#define MAYBE_ManualEnrollment ManualEnrollment
-#endif
-IN_PROC_BROWSER_TEST_F(EnrollmentLocalPolicyServerBase,
-                       MAYBE_ManualEnrollment) {
  TriggerEnrollmentAndSignInSuccessfully();
  enrollment_ui_.WaitForStep(test::ui::kEnrollmentStepSuccess);
@@ -264,16 +257,8 @@ IN_PROC_BROWSER_TEST_F(EnrollmentLocalPolicyServerBase,
 }
 // Simple manual enrollment with device attributes prompt.
-// TODO(https://crbug.com/1031275): Slow on MSAN and debug builds.
-#if defined(MEMORY_SANITIZER)
-#define MAYBE_ManualEnrollmentWithDeviceAttributes \
-  DISABLED_ManualEnrollmentWithDeviceAttributes
-#else
-#define MAYBE_ManualEnrollmentWithDeviceAttributes \
-  ManualEnrollmentWithDeviceAttributes
-#endif
 IN_PROC_BROWSER_TEST_F(EnrollmentLocalPolicyServerBase,
-                       MAYBE_ManualEnrollmentWithDeviceAttributes) {
+                       ManualEnrollmentWithDeviceAttributes) {
  policy_server_.SetUpdateDeviceAttributesPermission(true);
  TriggerEnrollmentAndSignInSuccessfully();
@@ -290,14 +275,8 @@ IN_PROC_BROWSER_TEST_F(EnrollmentLocalPolicyServerBase,
 // device_management_service.cc
 // Error during enrollment : 402 - missing licenses.
-// TODO(https://crbug.com/1031275): Slow on MSAN builds.
-#if defined(MEMORY_SANITIZER)
-#define MAYBE_EnrollmentErrorNoLicenses DISABLED_EnrollmentErrorNoLicenses
-#else
-#define MAYBE_EnrollmentErrorNoLicenses EnrollmentErrorNoLicenses
-#endif
 IN_PROC_BROWSER_TEST_F(EnrollmentLocalPolicyServerBase,
-                       MAYBE_EnrollmentErrorNoLicenses) {
+                       EnrollmentErrorNoLicenses) {
  policy_server_.SetExpectedDeviceEnrollmentError(402);
  TriggerEnrollmentAndSignInSuccessfully();
@@ -311,16 +290,8 @@ IN_PROC_BROWSER_TEST_F(EnrollmentLocalPolicyServerBase,
 }
 // Error during enrollment : 403 - management not allowed.
-// TODO(https://crbug.com/1031275): Slow on MSAN builds.
-#if defined(MEMORY_SANITIZER)
-#define MAYBE_EnrollmentErrorManagementNotAllowed \
-  DISABLED_EnrollmentErrorManagementNotAllowed
-#else
-#define MAYBE_EnrollmentErrorManagementNotAllowed \
-  EnrollmentErrorManagementNotAllowed
-#endif
 IN_PROC_BROWSER_TEST_F(EnrollmentLocalPolicyServerBase,
-                       MAYBE_EnrollmentErrorManagementNotAllowed) {
+                       EnrollmentErrorManagementNotAllowed) {
  policy_server_.SetExpectedDeviceEnrollmentError(403);
  TriggerEnrollmentAndSignInSuccessfully();
@@ -334,16 +305,8 @@ IN_PROC_BROWSER_TEST_F(EnrollmentLocalPolicyServerBase,
 }
 // Error during enrollment : 405 - invalid device serial.
-// TODO(https://crbug.com/1031275): Slow on MSAN builds.
-#if defined(MEMORY_SANITIZER)
-#define MAYBE_EnrollmentErrorInvalidDeviceSerial \
-  DISABLED_EnrollmentErrorInvalidDeviceSerial
-#else
-#define MAYBE_EnrollmentErrorInvalidDeviceSerial \
-  EnrollmentErrorInvalidDeviceSerial
-#endif
 IN_PROC_BROWSER_TEST_F(EnrollmentLocalPolicyServerBase,
-                       MAYBE_EnrollmentErrorInvalidDeviceSerial) {
+                       EnrollmentErrorInvalidDeviceSerial) {
  policy_server_.SetExpectedDeviceEnrollmentError(405);
  TriggerEnrollmentAndSignInSuccessfully();
@@ -359,15 +322,8 @@ IN_PROC_BROWSER_TEST_F(EnrollmentLocalPolicyServerBase,
 }
 // Error during enrollment : 406 - domain mismatch
-// TODO(https://crbug.com/1031275): Slow on MSAN builds.
-#if defined(MEMORY_SANITIZER)
-#define MAYBE_EnrollmentErrorDomainMismatch \
-  DISABLED_EnrollmentErrorDomainMismatch
-#else
-#define MAYBE_EnrollmentErrorDomainMismatch EnrollmentErrorDomainMismatch
-#endif
 IN_PROC_BROWSER_TEST_F(EnrollmentLocalPolicyServerBase,
-                       MAYBE_EnrollmentErrorDomainMismatch) {
+                       EnrollmentErrorDomainMismatch) {
  policy_server_.SetExpectedDeviceEnrollmentError(406);
  TriggerEnrollmentAndSignInSuccessfully();
@@ -381,15 +337,8 @@ IN_PROC_BROWSER_TEST_F(EnrollmentLocalPolicyServerBase,
 }
 // Error during enrollment : 409 - Device ID is already in use
-// TODO(https://crbug.com/1031275): Slow on MSAN builds.
-#if defined(MEMORY_SANITIZER)
-#define MAYBE_EnrollmentErrorDeviceIDConflict \
-  DISABLED_EnrollmentErrorDeviceIDConflict
-#else
-#define MAYBE_EnrollmentErrorDeviceIDConflict EnrollmentErrorDeviceIDConflict
-#endif
 IN_PROC_BROWSER_TEST_F(EnrollmentLocalPolicyServerBase,
-                       MAYBE_EnrollmentErrorDeviceIDConflict) {
+                       EnrollmentErrorDeviceIDConflict) {
  policy_server_.SetExpectedDeviceEnrollmentError(409);
  TriggerEnrollmentAndSignInSuccessfully();
@@ -404,16 +353,8 @@ IN_PROC_BROWSER_TEST_F(EnrollmentLocalPolicyServerBase,
 }
 // Error during enrollment : 412 - Activation is pending
-// TODO(https://crbug.com/1031275): Slow on MSAN builds.
-#if defined(MEMORY_SANITIZER)
-#define MAYBE_EnrollmentErrorActivationIsPending \
-  DISABLED_EnrollmentErrorActivationIsPending
-#else
-#define MAYBE_EnrollmentErrorActivationIsPending \
-  EnrollmentErrorActivationIsPending
-#endif
 IN_PROC_BROWSER_TEST_F(EnrollmentLocalPolicyServerBase,
-                       MAYBE_EnrollmentErrorActivationIsPending) {
+                       EnrollmentErrorActivationIsPending) {
  policy_server_.SetExpectedDeviceEnrollmentError(412);
  TriggerEnrollmentAndSignInSuccessfully();
@@ -427,18 +368,8 @@ IN_PROC_BROWSER_TEST_F(EnrollmentLocalPolicyServerBase,
 }
 // Error during enrollment : 417 - Consumer account with packaged license.
-// Disable due to flaky crash/timeout on MSAN. https://crbug.com/1028650
+IN_PROC_BROWSER_TEST_F(EnrollmentLocalPolicyServerBase,
-// TODO(https://crbug.com/1031275): Slow on MSAN builds.
+                       EnrollmentErrorConsumerAccountWithPackagedLicense) {
-#if defined(MEMORY_SANITIZER)
-#define MAYBE_EnrollmentErrorConsumerAccountWithPackagedLicense \
-  DISABLED_EnrollmentErrorConsumerAccountWithPackagedLicense
-#else
-#define MAYBE_EnrollmentErrorConsumerAccountWithPackagedLicense \
-  EnrollmentErrorConsumerAccountWithPackagedLicense
-#endif
-IN_PROC_BROWSER_TEST_F(
-    EnrollmentLocalPolicyServerBase,
-    MAYBE_EnrollmentErrorConsumerAccountWithPackagedLicense) {
  policy_server_.SetExpectedDeviceEnrollmentError(417);
  TriggerEnrollmentAndSignInSuccessfully();
@@ -453,14 +384,8 @@ IN_PROC_BROWSER_TEST_F(
 }
 // Error during enrollment : 500 - Consumer account with packaged license.
-// TODO(https://crbug.com/1031275): Slow on MSAN builds.
-#if defined(MEMORY_SANITIZER)
-#define MAYBE_EnrollmentErrorServerError DISABLED_EnrollmentErrorServerError
-#else
-#define MAYBE_EnrollmentErrorServerError EnrollmentErrorServerError
-#endif
 IN_PROC_BROWSER_TEST_F(EnrollmentLocalPolicyServerBase,
-                       MAYBE_EnrollmentErrorServerError) {
+                       EnrollmentErrorServerError) {
  policy_server_.SetExpectedDeviceEnrollmentError(500);
  TriggerEnrollmentAndSignInSuccessfully();
@@ -474,17 +399,8 @@ IN_PROC_BROWSER_TEST_F(EnrollmentLocalPolicyServerBase,
 }
 // Error during enrollment : 905 - Ineligible enterprise account.
-// TODO(https://crbug.com/1031275): Slow on MSAN builds.
+IN_PROC_BROWSER_TEST_F(EnrollmentLocalPolicyServerBase,
-#if defined(MEMORY_SANITIZER)
+                       EnrollmentErrorEnterpriseAccountIsNotEligibleToEnroll) {
-#define MAYBE_EnrollmentErrorEnterpriseAccountIsNotEligibleToEnroll \
-  DISABLED_EnrollmentErrorEnterpriseAccountIsNotEligibleToEnroll
-#else
-#define MAYBE_EnrollmentErrorEnterpriseAccountIsNotEligibleToEnroll \
-  EnrollmentErrorEnterpriseAccountIsNotEligibleToEnroll
-#endif
-IN_PROC_BROWSER_TEST_F(
-    EnrollmentLocalPolicyServerBase,
-    MAYBE_EnrollmentErrorEnterpriseAccountIsNotEligibleToEnroll) {
  policy_server_.SetExpectedDeviceEnrollmentError(905);
  TriggerEnrollmentAndSignInSuccessfully();
@@ -514,14 +430,8 @@ IN_PROC_BROWSER_TEST_F(EnrollmentLocalPolicyServerBase,
 }
 // Error during enrollment : Strange HTTP response from server.
-// TODO(https://crbug.com/1031275): Slow on MSAN builds.
-#if defined(MEMORY_SANITIZER)
-#define MAYBE_EnrollmentErrorServerIsDrunk DISABLED_EnrollmentErrorServerIsDrunk
-#else
-#define MAYBE_EnrollmentErrorServerIsDrunk EnrollmentErrorServerIsDrunk
-#endif
 IN_PROC_BROWSER_TEST_F(EnrollmentLocalPolicyServerBase,
-                       MAYBE_EnrollmentErrorServerIsDrunk) {
+                       EnrollmentErrorServerIsDrunk) {
  policy_server_.SetExpectedDeviceEnrollmentError(12345);
  TriggerEnrollmentAndSignInSuccessfully();
@@ -535,16 +445,8 @@ IN_PROC_BROWSER_TEST_F(EnrollmentLocalPolicyServerBase,
 }
 // Error during enrollment : Can not update device attributes
-// TODO(https://crbug.com/1031275): Slow on MSAN builds.
-#if defined(MEMORY_SANITIZER)
-#define MAYBE_EnrollmentErrorUploadingDeviceAttributes \
-  DISABLED_EnrollmentErrorUploadingDeviceAttributes
-#else
-#define MAYBE_EnrollmentErrorUploadingDeviceAttributes \
-  EnrollmentErrorUploadingDeviceAttributes
-#endif
 IN_PROC_BROWSER_TEST_F(EnrollmentLocalPolicyServerBase,
-                       MAYBE_EnrollmentErrorUploadingDeviceAttributes) {
+                       EnrollmentErrorUploadingDeviceAttributes) {
  policy_server_.SetUpdateDeviceAttributesPermission(true);
  policy_server_.SetExpectedDeviceAttributeUpdateError(500);
@@ -564,16 +466,8 @@ IN_PROC_BROWSER_TEST_F(EnrollmentLocalPolicyServerBase,
 }
 // Error during enrollment : Error fetching policy : 500 server error.
-// TODO(https://crbug.com/1031275): Slow on MSAN builds.
-#if defined(MEMORY_SANITIZER)
-#define MAYBE_EnrollmentErrorFetchingPolicyTransient \
-  DISABLED_EnrollmentErrorFetchingPolicyTransient
-#else
-#define MAYBE_EnrollmentErrorFetchingPolicyTransient \
-  EnrollmentErrorFetchingPolicyTransient
-#endif
 IN_PROC_BROWSER_TEST_F(EnrollmentLocalPolicyServerBase,
-                       MAYBE_EnrollmentErrorFetchingPolicyTransient) {
+                       EnrollmentErrorFetchingPolicyTransient) {
  policy_server_.SetExpectedPolicyFetchError(500);
  TriggerEnrollmentAndSignInSuccessfully();
@@ -587,16 +481,8 @@ IN_PROC_BROWSER_TEST_F(EnrollmentLocalPolicyServerBase,
 }
 // Error during enrollment : Error fetching policy : 902 - policy not found.
-// TODO(https://crbug.com/1031275): Slow on MSAN builds.
-#if defined(MEMORY_SANITIZER)
-#define MAYBE_EnrollmentErrorFetchingPolicyNotFound \
-  DISABLED_EnrollmentErrorFetchingPolicyNotFound
-#else
-#define MAYBE_EnrollmentErrorFetchingPolicyNotFound \
-  EnrollmentErrorFetchingPolicyNotFound
-#endif
 IN_PROC_BROWSER_TEST_F(EnrollmentLocalPolicyServerBase,
-                       MAYBE_EnrollmentErrorFetchingPolicyNotFound) {
+                       EnrollmentErrorFetchingPolicyNotFound) {
  policy_server_.SetExpectedPolicyFetchError(902);
  TriggerEnrollmentAndSignInSuccessfully();
@@ -611,16 +497,8 @@ IN_PROC_BROWSER_TEST_F(EnrollmentLocalPolicyServerBase,
 }
 // Error during enrollment : Error fetching policy : 903 - deprovisioned.
-// TODO(https://crbug.com/1031275): Slow on MSAN builds.
-#if defined(MEMORY_SANITIZER)
-#define MAYBE_EnrollmentErrorFetchingPolicyDeprovisioned \
-  DISABLED_EnrollmentErrorFetchingPolicyDeprovisioned
-#else
-#define MAYBE_EnrollmentErrorFetchingPolicyDeprovisioned \
-  EnrollmentErrorFetchingPolicyDeprovisioned
-#endif
 IN_PROC_BROWSER_TEST_F(EnrollmentLocalPolicyServerBase,
-                       MAYBE_EnrollmentErrorFetchingPolicyDeprovisioned) {
+                       EnrollmentErrorFetchingPolicyDeprovisioned) {
  policy_server_.SetExpectedPolicyFetchError(903);
  TriggerEnrollmentAndSignInSuccessfully();
@@ -634,27 +512,13 @@ IN_PROC_BROWSER_TEST_F(EnrollmentLocalPolicyServerBase,
 }
 // No state keys on the server. Auto enrollment check should proceed to login.
-// TODO(https://crbug.com/1031275): Slow on MSAN builds.
+IN_PROC_BROWSER_TEST_F(AutoEnrollmentLocalPolicyServer, AutoEnrollmentCheck) {
-#if defined(MEMORY_SANITIZER)
-#define MAYBE_AutoEnrollmentCheck DISABLED_AutoEnrollmentCheck
-#else
-#define MAYBE_AutoEnrollmentCheck AutoEnrollmentCheck
-#endif
-IN_PROC_BROWSER_TEST_F(AutoEnrollmentLocalPolicyServer,
-                       MAYBE_AutoEnrollmentCheck) {
  host()->StartWizard(AutoEnrollmentCheckScreenView::kScreenId);
  OobeScreenWaiter(GaiaView::kScreenId).Wait();
 }
 // State keys are present but restore mode is not requested.
-// TODO(https://crbug.com/1031275): Slow on MSAN builds.
+IN_PROC_BROWSER_TEST_F(AutoEnrollmentLocalPolicyServer, ReenrollmentNone) {
-#if defined(MEMORY_SANITIZER)
-#define MAYBE_ReenrollmentNone DISABLED_ReenrollmentNone
-#else
-#define MAYBE_ReenrollmentNone ReenrollmentNone
-#endif
-IN_PROC_BROWSER_TEST_F(AutoEnrollmentLocalPolicyServer,
-                       MAYBE_ReenrollmentNone) {
  EXPECT_TRUE(policy_server_.SetDeviceStateRetrievalResponse(
      state_keys_broker(),
      enterprise_management::DeviceStateRetrievalResponse::RESTORE_MODE_NONE,
@@ -664,14 +528,7 @@ IN_PROC_BROWSER_TEST_F(AutoEnrollmentLocalPolicyServer,
 }
 // Reenrollment requested. User can skip.
-// TODO(https://crbug.com/1031275): Slow on MSAN builds.
+IN_PROC_BROWSER_TEST_F(AutoEnrollmentLocalPolicyServer, ReenrollmentRequested) {
-#if defined(MEMORY_SANITIZER)
-#define MAYBE_ReenrollmentRequested DISABLED_ReenrollmentRequested
-#else
-#define MAYBE_ReenrollmentRequested ReenrollmentRequested
-#endif
-IN_PROC_BROWSER_TEST_F(AutoEnrollmentLocalPolicyServer,
-                       MAYBE_ReenrollmentRequested) {
  EXPECT_TRUE(policy_server_.SetDeviceStateRetrievalResponse(
      state_keys_broker(),
      enterprise_management::DeviceStateRetrievalResponse::
@@ -684,14 +541,7 @@ IN_PROC_BROWSER_TEST_F(AutoEnrollmentLocalPolicyServer,
 }
 // Reenrollment forced. User can not skip.
-// TODO(https://crbug.com/1031275): Slow on MSAN builds.
+IN_PROC_BROWSER_TEST_F(AutoEnrollmentLocalPolicyServer, ReenrollmentForced) {
-#if defined(MEMORY_SANITIZER)
-#define MAYBE_ReenrollmentForced DISABLED_ReenrollmentForced
-#else
-#define MAYBE_ReenrollmentForced ReenrollmentForced
-#endif
-IN_PROC_BROWSER_TEST_F(AutoEnrollmentLocalPolicyServer,
-                       MAYBE_ReenrollmentForced) {
  EXPECT_TRUE(policy_server_.SetDeviceStateRetrievalResponse(
      state_keys_broker(),
      enterprise_management::DeviceStateRetrievalResponse::
@@ -705,13 +555,7 @@ IN_PROC_BROWSER_TEST_F(AutoEnrollmentLocalPolicyServer,
 }
 // Device is disabled.
-// TODO(https://crbug.com/1031275): Slow on MSAN builds.
+IN_PROC_BROWSER_TEST_F(AutoEnrollmentLocalPolicyServer, DeviceDisabled) {
-#if defined(MEMORY_SANITIZER)
-#define MAYBE_DeviceDisabled DISABLED_DeviceDisabled
-#else
-#define MAYBE_DeviceDisabled DeviceDisabled
-#endif
-IN_PROC_BROWSER_TEST_F(AutoEnrollmentLocalPolicyServer, MAYBE_DeviceDisabled) {
  EXPECT_TRUE(policy_server_.SetDeviceStateRetrievalResponse(
      state_keys_broker(),
      enterprise_management::DeviceStateRetrievalResponse::
@@ -722,13 +566,7 @@ IN_PROC_BROWSER_TEST_F(AutoEnrollmentLocalPolicyServer, MAYBE_DeviceDisabled) {
 }
 // Attestation enrollment.
-// TODO(https://crbug.com/1031275): Slow on MSAN builds.
+IN_PROC_BROWSER_TEST_F(AutoEnrollmentLocalPolicyServer, Attestation) {
-#if defined(MEMORY_SANITIZER)
-#define MAYBE_Attestation DISABLED_Attestation
-#else
-#define MAYBE_Attestation Attestation
-#endif
-IN_PROC_BROWSER_TEST_F(AutoEnrollmentLocalPolicyServer, MAYBE_Attestation) {
  policy_server_.SetFakeAttestationFlow();
  EXPECT_TRUE(policy_server_.SetDeviceStateRetrievalResponse(
      state_keys_broker(),
@@ -743,13 +581,7 @@ IN_PROC_BROWSER_TEST_F(AutoEnrollmentLocalPolicyServer, MAYBE_Attestation) {
 }
 // FRE explicitly required in VPD, but the state keys are missing.
-// TODO(https://crbug.com/1031275): Slow on MSAN builds.
+IN_PROC_BROWSER_TEST_F(AutoEnrollmentNoStateKeys, FREExplicitlyRequired) {
-#if defined(MEMORY_SANITIZER)
-#define MAYBE_FREExplicitlyRequired DISABLED_FREExplicitlyRequired
-#else
-#define MAYBE_FREExplicitlyRequired FREExplicitlyRequired
-#endif
-IN_PROC_BROWSER_TEST_F(AutoEnrollmentNoStateKeys, MAYBE_FREExplicitlyRequired) {
  SetFRERequiredKey("1");
  host()->StartWizard(AutoEnrollmentCheckScreenView::kScreenId);
  OobeScreenWaiter(AutoEnrollmentCheckScreenView::kScreenId).Wait();
@@ -760,27 +592,14 @@ IN_PROC_BROWSER_TEST_F(AutoEnrollmentNoStateKeys, MAYBE_FREExplicitlyRequired) {
 // FRE not explicitly required and the state keys are missing. Should proceed to
 // normal signin.
-// TODO(https://crbug.com/1031275): Slow on MSAN builds.
+IN_PROC_BROWSER_TEST_F(AutoEnrollmentNoStateKeys, NotRequired) {
-#if defined(MEMORY_SANITIZER)
-#define MAYBE_NotRequired DISABLED_NotRequired
-#else
-#define MAYBE_NotRequired NotRequired
-#endif
-IN_PROC_BROWSER_TEST_F(AutoEnrollmentNoStateKeys, MAYBE_NotRequired) {
  host()->StartWizard(AutoEnrollmentCheckScreenView::kScreenId);
  OobeScreenWaiter(GaiaView::kScreenId).Wait();
 }
 // FRE explicitly not required in VPD, so it should not even contact the policy
 // server.
-// TODO(https://crbug.com/1031275): Slow on MSAN builds.
+IN_PROC_BROWSER_TEST_F(AutoEnrollmentWithStatistics, ExplicitlyNotRequired) {
-#if defined(MEMORY_SANITIZER)
-#define MAYBE_ExplicitlyNotRequired DISABLED_ExplicitlyNotRequired
-#else
-#define MAYBE_ExplicitlyNotRequired ExplicitlyNotRequired
-#endif
-IN_PROC_BROWSER_TEST_F(AutoEnrollmentWithStatistics,
-                       MAYBE_ExplicitlyNotRequired) {
  SetFRERequiredKey("0");
  // Should be ignored.
@@ -795,14 +614,7 @@ IN_PROC_BROWSER_TEST_F(AutoEnrollmentWithStatistics,
 }
 // FRE is not required when VPD is valid and activate date is not there.
-// TODO(https://crbug.com/1031275): Slow on MSAN builds.
+IN_PROC_BROWSER_TEST_F(AutoEnrollmentWithStatistics, MachineNotActivated) {
-#if defined(MEMORY_SANITIZER)
-#define MAYBE_MachineNotActivated DISABLED_MachineNotActivated
-#else
-#define MAYBE_MachineNotActivated MachineNotActivated
-#endif
-IN_PROC_BROWSER_TEST_F(AutoEnrollmentWithStatistics,
-                       MAYBE_MachineNotActivated) {
  // Should be ignored.
  EXPECT_TRUE(policy_server_.SetDeviceStateRetrievalResponse(
      state_keys_broker(),
@@ -815,13 +627,7 @@ IN_PROC_BROWSER_TEST_F(AutoEnrollmentWithStatistics,
 }
 // FRE is required when VPD is valid and activate date is there.
-// TODO(https://crbug.com/1031275): Slow on MSAN builds.
+IN_PROC_BROWSER_TEST_F(AutoEnrollmentWithStatistics, MachineActivated) {
-#if defined(MEMORY_SANITIZER)
-#define MAYBE_MachineActivated DISABLED_MachineActivated
-#else
-#define MAYBE_MachineActivated MachineActivated
-#endif
-IN_PROC_BROWSER_TEST_F(AutoEnrollmentWithStatistics, MAYBE_MachineActivated) {
  SetActivateDate("1970-01");
  EXPECT_TRUE(policy_server_.SetDeviceStateRetrievalResponse(
@@ -835,13 +641,7 @@ IN_PROC_BROWSER_TEST_F(AutoEnrollmentWithStatistics, MAYBE_MachineActivated) {
 }
 // FRE is required when VPD in invalid state.
-// TODO(https://crbug.com/1031275): Slow on MSAN builds.
+IN_PROC_BROWSER_TEST_F(AutoEnrollmentWithStatistics, CorruptedVPD) {
-#if defined(MEMORY_SANITIZER)
-#define MAYBE_CorruptedVPD DISABLED_CorruptedVPD
-#else
-#define MAYBE_CorruptedVPD CorruptedVPD
-#endif
-IN_PROC_BROWSER_TEST_F(AutoEnrollmentWithStatistics, MAYBE_CorruptedVPD) {
  SetVPDCorrupted();
  EXPECT_TRUE(policy_server_.SetDeviceStateRetrievalResponse(
@@ -875,13 +675,7 @@ class EnrollmentRecoveryTest : public EnrollmentLocalPolicyServerBase {
  DISALLOW_COPY_AND_ASSIGN(EnrollmentRecoveryTest);
 };
-// TODO(https://crbug.com/995784): Slow on MSAN builds.
+IN_PROC_BROWSER_TEST_F(EnrollmentRecoveryTest, Success) {
-#if defined(MEMORY_SANITIZER)
-#define MAYBE_Success DISABLED_Success
-#else
-#define MAYBE_Success Success
-#endif
-IN_PROC_BROWSER_TEST_F(EnrollmentRecoveryTest, MAYBE_Success) {
  test::SkipToEnrollmentOnRecovery();
  ASSERT_TRUE(StartupUtils::IsDeviceRegistered());
@@ -906,13 +700,7 @@ IN_PROC_BROWSER_TEST_F(EnrollmentRecoveryTest, MAYBE_Success) {
          .empty());
 }
-// TODO(https://crbug.com/995784): Slow on MSAN builds.
+IN_PROC_BROWSER_TEST_F(EnrollmentRecoveryTest, DifferentDomain) {
-#if defined(MEMORY_SANITIZER)
-#define MAYBE_DifferentDomain DISABLED_DifferentDomain
-#else
-#define MAYBE_DifferentDomain DifferentDomain
-#endif
-IN_PROC_BROWSER_TEST_F(EnrollmentRecoveryTest, MAYBE_DifferentDomain) {
  test::SkipToEnrollmentOnRecovery();
  ASSERT_TRUE(StartupUtils::IsDeviceRegistered());
@@ -925,13 +713,7 @@ IN_PROC_BROWSER_TEST_F(EnrollmentRecoveryTest, MAYBE_DifferentDomain) {
  enrollment_ui_.RetryAfterError();
 }
-// TODO(https://crbug.com/1031275): Slow on MSAN builds.
+IN_PROC_BROWSER_TEST_F(InitialEnrollmentTest, EnrollmentForced) {
-#if defined(MEMORY_SANITIZER)
-#define MAYBE_EnrollmentForced DISABLED_EnrollmentForced
-#else
-#define MAYBE_EnrollmentForced EnrollmentForced
-#endif
-IN_PROC_BROWSER_TEST_F(InitialEnrollmentTest, MAYBE_EnrollmentForced) {
  auto initial_enrollment =
      enterprise_management::DeviceInitialEnrollmentStateResponse::
          INITIAL_ENROLLMENT_MODE_ENROLLMENT_ENFORCED;
@@ -958,15 +740,7 @@ IN_PROC_BROWSER_TEST_F(InitialEnrollmentTest, MAYBE_EnrollmentForced) {
 // Zero touch with attestation authentication fail. Attestation fails because we
 // send empty cert request. Should switch to interactive authentication.
-// TODO(https://crbug.com/1031275): Slow on MSAN builds.
+IN_PROC_BROWSER_TEST_F(InitialEnrollmentTest, ZeroTouchForcedAttestationFail) {
-#if defined(MEMORY_SANITIZER)
-#define MAYBE_ZeroTouchForcedAttestationFail \
-  DISABLED_ZeroTouchForcedAttestationFail
-#else
-#define MAYBE_ZeroTouchForcedAttestationFail ZeroTouchForcedAttestationFail
-#endif
-IN_PROC_BROWSER_TEST_F(InitialEnrollmentTest,
-                       MAYBE_ZeroTouchForcedAttestationFail) {
  auto initial_enrollment =
      enterprise_management::DeviceInitialEnrollmentStateResponse::
          INITIAL_ENROLLMENT_MODE_ZERO_TOUCH_ENFORCED;
@@ -1001,16 +775,8 @@ IN_PROC_BROWSER_TEST_F(InitialEnrollmentTest,
  EXPECT_TRUE(InstallAttributes::Get()->IsEnterpriseManaged());
 }
-// TODO(https://crbug.com/1031275): Slow on MSAN builds.
-#if defined(MEMORY_SANITIZER)
-#define MAYBE_ZeroTouchForcedAttestationSuccess \
-  DISABLED_ZeroTouchForcedAttestationSuccess
-#else
-#define MAYBE_ZeroTouchForcedAttestationSuccess \
-  ZeroTouchForcedAttestationSuccess
-#endif
 IN_PROC_BROWSER_TEST_F(InitialEnrollmentTest,
-                       MAYBE_ZeroTouchForcedAttestationSuccess) {
+                       ZeroTouchForcedAttestationSuccess) {
  policy_server_.SetupZeroTouchForcedEnrollment();
  host()->StartWizard(AutoEnrollmentCheckScreenView::kScreenId);
@@ -1035,13 +801,7 @@ class OobeGuestButtonPolicy : public testing::WithParamInterface<bool>,
  DISALLOW_COPY_AND_ASSIGN(OobeGuestButtonPolicy);
 };
-// TODO(https://crbug.com/1031275): Slow on MSAN builds.
+IN_PROC_BROWSER_TEST_P(OobeGuestButtonPolicy, VisibilityAfterEnrollment) {
-#if defined(MEMORY_SANITIZER)
-#define MAYBE_VisibilityAfterEnrollment DISABLED_VisibilityAfterEnrollment
-#else
-#define MAYBE_VisibilityAfterEnrollment VisibilityAfterEnrollment
-#endif
-IN_PROC_BROWSER_TEST_P(OobeGuestButtonPolicy, MAYBE_VisibilityAfterEnrollment) {
  TriggerEnrollmentAndSignInSuccessfully();
  enrollment_ui_.WaitForStep(test::ui::kEnrollmentStepSuccess);
  ConfirmAndWaitLoginScreen();

--- a/chrome/browser/chromeos/login/login_browsertest.cc
+++ b/chrome/browser/chromeos/login/login_browsertest.cc
@@ -168,12 +168,7 @@ IN_PROC_BROWSER_TEST_F(LoginOfflineTest, PRE_GaiaAuthOffline) {
  offline_gaia_test_mixin_.PrepareOfflineGaiaLogin();
 }
-#if defined(OS_LINUX) && defined(MEMORY_SANITIZER)
+IN_PROC_BROWSER_TEST_F(LoginOfflineTest, GaiaAuthOffline) {
-#define MAYBE_GaiaAuthOffline DISABLED_GaiaAuthOffline
-#else
-#define MAYBE_GaiaAuthOffline GaiaAuthOffline
-#endif
-IN_PROC_BROWSER_TEST_F(LoginOfflineTest, MAYBE_GaiaAuthOffline) {
  offline_gaia_test_mixin_.GoOffline();
  offline_gaia_test_mixin_.InitOfflineLogin(test_account_id_,
                                            LoginManagerTest::kPassword);

--- a/testing/buildbot/filters/chromeos.msan.browser_tests.oobe_negative.filter
+++ b/testing/buildbot/filters/chromeos.msan.browser_tests.oobe_negative.filter
@@ -57,6 +57,7 @@
 -KioskUpdateTest.*
 -KioskVirtualKeyboardTest.*
 -LoginCursorTest.*
+-LoginOfflineTest.*
 -LoginPolicyTestBase.*
 -MarketingOptInScreenTest.*
 -MarketingOptInScreenTestDisabled.*

--- a/testing/buildbot/filters/chromeos.msan.browser_tests.oobe_positive.filter
+++ b/testing/buildbot/filters/chromeos.msan.browser_tests.oobe_positive.filter
@@ -57,6 +57,7 @@ KioskTest.*
 KioskUpdateTest.*
 KioskVirtualKeyboardTest.*
 LoginCursorTest.*
+LoginOfflineTest.*
 LoginPolicyTestBase.*
 MarketingOptInScreenTest.*
 MarketingOptInScreenTestDisabled.*