[Sync] Fix bug in NonUIDataTypeController::Stop().

chrome/browser/sync/test/integration/two_client_passwords_sync_test.cc

Index: chrome/browser/sync/test/integration/two_client_passwords_sync_test.cc
diff --git a/chrome/browser/sync/test/integration/two_client_passwords_sync_test.cc b/chrome/browser/sync/test/integration/two_client_passwords_sync_test.cc
index 49663afb9af3e872c025d04ae540686687f5afd0..a2c1b911988447be7a2e4ed8f770c9dcef5ab46c 100644
--- a/chrome/browser/sync/test/integration/two_client_passwords_sync_test.cc
+++ b/chrome/browser/sync/test/integration/two_client_passwords_sync_test.cc
@@ -143,14 +143,8 @@ IN_PROC_BROWSER_TEST_F(TwoClientPasswordsSyncTest, Delete) {
   ASSERT_TRUE(AllProfilesContainSamePasswordFormsAsVerifier());
 }
 
-// Flaky on Mac: https://crbug.com/639449
-#if defined(OS_MACOSX)
-#define MAYBE_SetPassphraseAndThenSetupSync DISABLED_SetPassphraseAndThenSetupSync
-#else
-#define MAYBE_SetPassphraseAndThenSetupSync SetPassphraseAndThenSetupSync
-#endif
 IN_PROC_BROWSER_TEST_F(TwoClientPasswordsSyncTest,
-                       MAYBE_SetPassphraseAndThenSetupSync) {
+                       SetPassphraseAndThenSetupSync) {
   ASSERT_TRUE(SetupClients());
 
   ASSERT_TRUE(GetClient(0)->SetupSync());