| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/sync/profile_sync_service_harness.h" | 5 #include "chrome/browser/sync/profile_sync_service_harness.h" |
| 6 #include "chrome/test/live_sync/live_bookmarks_sync_test.h" | 6 #include "chrome/test/live_sync/live_bookmarks_sync_test.h" |
| 7 | 7 |
| 8 | 8 |
| 9 class SyncErrorTest : public SingleClientLiveBookmarksSyncTest { | 9 class SyncErrorTest : public SingleClientLiveBookmarksSyncTest { |
| 10 }; | 10 }; |
| 11 | 11 |
| 12 IN_PROC_BROWSER_TEST_F(SyncErrorTest, BirthdayErrorTest) { | 12 IN_PROC_BROWSER_TEST_F(SyncErrorTest, BirthdayErrorTest) { |
| 13 ASSERT_TRUE(SetupSync()) << "SetupSync() failed."; | 13 ASSERT_TRUE(SetupSync()) << "SetupSync() failed."; |
| 14 | 14 |
| 15 const BookmarkNode* node1 = AddFolder(0, L"title1"); | 15 const BookmarkNode* node1 = AddFolder(0, L"title1"); |
| 16 SetTitle(0, node1, L"new_title1"); | 16 SetTitle(0, node1, L"new_title1"); |
| 17 ASSERT_TRUE(GetClient(0)->AwaitSyncCycleCompletion("Offline state change.")); | 17 ASSERT_TRUE(GetClient(0)->AwaitSyncCycleCompletion("Offline state change.")); |
| 18 TriggerBirthdayError(); | 18 TriggerBirthdayError(); |
| 19 | 19 |
| 20 // Now make one more change so we will do another sync. | 20 // Now make one more change so we will do another sync. |
| 21 const BookmarkNode* node2 = AddFolder(0, L"title2"); | 21 const BookmarkNode* node2 = AddFolder(0, L"title2"); |
| 22 SetTitle(0, node1, L"new_title2"); | 22 SetTitle(0, node1, L"new_title2"); |
| 23 ASSERT_TRUE(GetClient(0)->AwaitSyncDisabled("Birthday error.")); | 23 ASSERT_TRUE(GetClient(0)->AwaitSyncDisabled("Birthday error.")); |
| 24 } | 24 } |
| 25 |
| 26 IN_PROC_BROWSER_TEST_F(SyncErrorTest, TransientErrorTest) { |
| 27 ASSERT_TRUE(SetupSync()) << "SetupSync() failed."; |
| 28 |
| 29 const BookmarkNode* node1 = AddFolder(0, L"title1"); |
| 30 SetTitle(0, node1, L"new_title1"); |
| 31 ASSERT_TRUE(GetClient(0)->AwaitSyncCycleCompletion("Offline state change.")); |
| 32 TriggerTransientError(); |
| 33 |
| 34 // Now make one more change so we will do another sync. |
| 35 const BookmarkNode* node2 = AddFolder(0, L"title2"); |
| 36 SetTitle(0, node1, L"new_title2"); |
| 37 ASSERT_TRUE( |
| 38 GetClient(0)->AwaitExponentialBackoffVerification()); |
| 39 } |
| OLD | NEW |