Trim code from sync's ServerConnectionManager

chrome/browser/sync/test/integration/single_client_bookmarks_sync_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 "chrome/browser/profiles/profile.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/sync_test.h"
 
 using bookmarks_helper::AddFolder;
@@ skipping 13 matching lines @@
  private:
   DISALLOW_COPY_AND_ASSIGN(SingleClientBookmarksSyncTest);
 };
 
 IN_PROC_BROWSER_TEST_F(SingleClientBookmarksSyncTest, OfflineToOnline) {
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
 
   DisableNetwork(GetProfile(0));
   const BookmarkNode* node = AddFolder(0, L"title");
   SetTitle(0, node, L"new_title");
-  ASSERT_FALSE(GetClient(0)->AwaitFullSyncCompletion("Offline state change."));
-  ProfileSyncService::Status status = GetClient(0)->GetStatus();
-
-  // Depending on when exactly the network change notification occurs the
-  // client could go to OFFLINE_UNSYNCED or OFFLINE. OFFLINE_UNSYNCED indicates
-  // client tried to sync a local change and could not connect to the server.
-  // OFFLINE indicates client received a network change notification of
-  // the disconnection even before it tried to sync.
-  ASSERT_TRUE(ProfileSyncService::Status::OFFLINE_UNSYNCED == status.summary ||
-              ProfileSyncService::Status::OFFLINE == status.summary);
+  // Expect that we backoff exponentially while we are unable to contact the
+  // server.
+  ASSERT_TRUE(GetClient(0)->AwaitExponentialBackoffVerification());
 
   EnableNetwork(GetProfile(0));
   ASSERT_TRUE(GetClient(0)->AwaitFullSyncCompletion("Commit changes."));
   ASSERT_EQ(ProfileSyncService::Status::READY,
             GetClient(0)->GetStatus().summary);
   ASSERT_TRUE(ModelMatchesVerifier(0));
 }
 
 IN_PROC_BROWSER_TEST_F(SingleClientBookmarksSyncTest, Sanity) {
   ASSERT_TRUE(SetupClients()) << "SetupClients() failed.";
@@ skipping 112 matching lines @@
   ASSERT_EQ(ProfileSyncService::Status::READY,
             GetClient(0)->GetStatus().summary);
 
   RestartSyncService(0);
   ASSERT_TRUE(GetClient(0)->AwaitFullSyncCompletion("Restarted sync."));
   ASSERT_TRUE(ModelMatchesVerifier(0));
   ASSERT_EQ(ProfileSyncService::Status::READY,
             GetClient(0)->GetStatus().summary);
   ASSERT_EQ(0, GetClient(0)->GetStatus().unsynced_count);
 }