sync: Finish the SyncScheduler refactor

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_member.h"
 #include "base/prefs/pref_service.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 122 matching lines @@
   ASSERT_TRUE(
       GetClient(0)->AwaitSyncDisabled("Birthday Error."));
   ProfileSyncService::Status status = GetClient(0)->GetStatus();
   ASSERT_EQ(status.sync_protocol_error.error_type, protocol_error.error_type);
   ASSERT_EQ(status.sync_protocol_error.action, protocol_error.action);
   ASSERT_EQ(status.sync_protocol_error.url, protocol_error.url);
   ASSERT_EQ(status.sync_protocol_error.error_description,
       protocol_error.error_description);
 }
 
-// Trigger an auth error and make sure the sync client detects it when
-// trying to commit.
+// Trigger an auth error and make sure the sync client displays a warning in the
+// UI.
 IN_PROC_BROWSER_TEST_F(SyncErrorTest, AuthErrorTest) {
-  ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
-
-  const BookmarkNode* node1 = AddFolder(0, 0, L"title1");
-  SetTitle(0, node1, L"new_title1");
-  ASSERT_TRUE(GetClient(0)->AwaitFullSyncCompletion("Sync."));
-
+  ASSERT_TRUE(SetupClients());
   TriggerAuthError();
 
-  const BookmarkNode* node2 = AddFolder(0, 0, L"title2");
-  SetTitle(0, node2, L"new_title2");
-  ASSERT_TRUE(GetClient(0)->AwaitExponentialBackoffVerification());
+  ASSERT_FALSE(GetClient(0)->SetupSync());
   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.
 IN_PROC_BROWSER_TEST_F(SyncErrorTest, XmppAuthErrorTest) {
   ASSERT_TRUE(SetupClients()) << "SetupClients() failed.";
 
   TriggerXmppAuthError();
@@ skipping 15 matching lines @@
 
   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.
 }