| 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/browser/sync/test/live_sync/bookmarks_helper.h" | 6 #include "chrome/browser/sync/test/integration/bookmarks_helper.h" |
| 7 #include "chrome/browser/sync/test/live_sync/live_sync_test.h" | 7 #include "chrome/browser/sync/test/integration/sync_test.h" |
| 8 | 8 |
| 9 using bookmarks_helper::AddFolder; | 9 using bookmarks_helper::AddFolder; |
| 10 using bookmarks_helper::SetTitle; | 10 using bookmarks_helper::SetTitle; |
| 11 | 11 |
| 12 class SyncErrorTest : public LiveSyncTest{ | 12 class SyncErrorTest : public SyncTest{ |
| 13 public: | 13 public: |
| 14 SyncErrorTest() : LiveSyncTest(SINGLE_CLIENT) {} | 14 SyncErrorTest() : SyncTest(SINGLE_CLIENT) {} |
| 15 virtual ~SyncErrorTest() {} | 15 virtual ~SyncErrorTest() {} |
| 16 | 16 |
| 17 private: | 17 private: |
| 18 DISALLOW_COPY_AND_ASSIGN(SyncErrorTest); | 18 DISALLOW_COPY_AND_ASSIGN(SyncErrorTest); |
| 19 }; | 19 }; |
| 20 | 20 |
| 21 IN_PROC_BROWSER_TEST_F(SyncErrorTest, BirthdayErrorTest) { | 21 IN_PROC_BROWSER_TEST_F(SyncErrorTest, BirthdayErrorTest) { |
| 22 ASSERT_TRUE(SetupSync()) << "SetupSync() failed."; | 22 ASSERT_TRUE(SetupSync()) << "SetupSync() failed."; |
| 23 | 23 |
| 24 const BookmarkNode* node1 = AddFolder(0, 0, L"title1"); | 24 const BookmarkNode* node1 = AddFolder(0, 0, L"title1"); |
| (...skipping 14 matching lines...) Expand all Loading... |
| 39 SetTitle(0, node1, L"new_title1"); | 39 SetTitle(0, node1, L"new_title1"); |
| 40 ASSERT_TRUE(GetClient(0)->AwaitSyncCycleCompletion("Offline state change.")); | 40 ASSERT_TRUE(GetClient(0)->AwaitSyncCycleCompletion("Offline state change.")); |
| 41 TriggerTransientError(); | 41 TriggerTransientError(); |
| 42 | 42 |
| 43 // Now make one more change so we will do another sync. | 43 // Now make one more change so we will do another sync. |
| 44 const BookmarkNode* node2 = AddFolder(0, 0, L"title2"); | 44 const BookmarkNode* node2 = AddFolder(0, 0, L"title2"); |
| 45 SetTitle(0, node2, L"new_title2"); | 45 SetTitle(0, node2, L"new_title2"); |
| 46 ASSERT_TRUE( | 46 ASSERT_TRUE( |
| 47 GetClient(0)->AwaitExponentialBackoffVerification()); | 47 GetClient(0)->AwaitExponentialBackoffVerification()); |
| 48 } | 48 } |
| OLD | NEW |