[sync] Re-enable SyncErrorTest.XmppAuthErrorTest

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

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/prefs/pref_service.h"
 #include "base/prefs/public/pref_member.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/sync/profile_sync_service_harness.h"
 #include "chrome/browser/sync/test/integration/bookmarks_helper.h"
 #include "chrome/browser/sync/test/integration/passwords_helper.h"
@@ skipping 142 matching lines @@
 
   const BookmarkNode* node2 = AddFolder(0, 0, L"title2");
   SetTitle(0, node2, L"new_title2");
   ASSERT_TRUE(GetClient(0)->AwaitExponentialBackoffVerification());
   ASSERT_EQ(GoogleServiceAuthError::INVALID_GAIA_CREDENTIALS,
             GetClient(0)->service()->GetAuthError().state());
 }
 
 // Trigger an XMPP auth error, and make sure sync treats it like any
 // other auth error.
-// This has been flaking a lot recently on Mac. http://crbug.com/165328
-#if defined(OS_MACOSX)
-#define MAYBE_XmppAuthErrorTest DISABLED_XmppAuthErrorTest
-#else
-#define MAYBE_XmppAuthErrorTest XmppAuthErrorTest
-#endif
-IN_PROC_BROWSER_TEST_F(SyncErrorTest, MAYBE_XmppAuthErrorTest) {
+IN_PROC_BROWSER_TEST_F(SyncErrorTest, XmppAuthErrorTest) {
   ASSERT_TRUE(SetupClients()) << "SetupClients() failed.";
 
   TriggerXmppAuthError();
 
   ASSERT_FALSE(GetClient(0)->SetupSync());
 
   ASSERT_EQ(GoogleServiceAuthError::INVALID_GAIA_CREDENTIALS,
             GetClient(0)->service()->GetAuthError().state());
 }
 
 // TODO(lipalani): Fix the typed_url dtc so this test case can pass.
 IN_PROC_BROWSER_TEST_F(SyncErrorTest, DISABLED_DisableDatatypeWhileRunning) {
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
   syncer::ModelTypeSet synced_datatypes =
       GetClient(0)->service()->GetPreferredDataTypes();
   ASSERT_TRUE(synced_datatypes.Has(syncer::TYPED_URLS));
   GetProfile(0)->GetPrefs()->SetBoolean(
       prefs::kSavingBrowserHistoryDisabled, true);
 
   synced_datatypes = GetClient(0)->service()->GetPreferredDataTypes();
   ASSERT_FALSE(synced_datatypes.Has(syncer::TYPED_URLS));
 
   const BookmarkNode* node1 = AddFolder(0, 0, L"title1");
   SetTitle(0, node1, L"new_title1");
   ASSERT_TRUE(GetClient(0)->AwaitFullSyncCompletion("Sync."));
   // TODO(lipalani)" Verify initial sync ended for typed url is false.
 }