Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(8117)

Unified Diff: chrome/browser/sync/test/integration/single_client_bookmarks_sync_test.cc

Issue 9348036: Trim code from sync's ServerConnectionManager (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase after Fred's patch Created 8 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/sync/sync_ui_util.cc ('k') | chrome/browser/sync/test/integration/sync_errors_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync/test/integration/single_client_bookmarks_sync_test.cc
diff --git a/chrome/browser/sync/test/integration/single_client_bookmarks_sync_test.cc b/chrome/browser/sync/test/integration/single_client_bookmarks_sync_test.cc
index 66d0afb8d3c486aaa276f5a8a07e5f375d18fa0e..59eb2737979a70d27676d678662b15f6039022f7 100644
--- a/chrome/browser/sync/test/integration/single_client_bookmarks_sync_test.cc
+++ b/chrome/browser/sync/test/integration/single_client_bookmarks_sync_test.cc
@@ -31,16 +31,9 @@ IN_PROC_BROWSER_TEST_F(SingleClientBookmarksSyncTest, OfflineToOnline) {
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."));
« no previous file with comments | « chrome/browser/sync/sync_ui_util.cc ('k') | chrome/browser/sync/test/integration/sync_errors_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698