| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/profiles/profile.h" | 5 #include "chrome/browser/profiles/profile.h" |
| 6 #include "chrome/browser/sync/profile_sync_service_harness.h" | 6 #include "chrome/browser/sync/profile_sync_service_harness.h" |
| 7 #include "chrome/browser/sync/test/integration/bookmarks_helper.h" | 7 #include "chrome/browser/sync/test/integration/bookmarks_helper.h" |
| 8 #include "chrome/browser/sync/test/integration/sync_test.h" | 8 #include "chrome/browser/sync/test/integration/sync_test.h" |
| 9 | 9 |
| 10 using bookmarks_helper::AddFolder; | 10 using bookmarks_helper::AddFolder; |
| (...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 152 DISABLED_RestartSyncService) { | 152 DISABLED_RestartSyncService) { |
| 153 ASSERT_TRUE(SetupSync()) << "SetupSync() failed."; | 153 ASSERT_TRUE(SetupSync()) << "SetupSync() failed."; |
| 154 | 154 |
| 155 ASSERT_TRUE(AddURL(0, L"Google", GURL("http://www.google.com"))); | 155 ASSERT_TRUE(AddURL(0, L"Google", GURL("http://www.google.com"))); |
| 156 ASSERT_TRUE(GetClient(0)->AwaitFullSyncCompletion("Added a bookmark.")); | 156 ASSERT_TRUE(GetClient(0)->AwaitFullSyncCompletion("Added a bookmark.")); |
| 157 ASSERT_TRUE(ModelMatchesVerifier(0)); | 157 ASSERT_TRUE(ModelMatchesVerifier(0)); |
| 158 | 158 |
| 159 RestartSyncService(0); | 159 RestartSyncService(0); |
| 160 ASSERT_TRUE(GetClient(0)->AwaitFullSyncCompletion("Restarted sync.")); | 160 ASSERT_TRUE(GetClient(0)->AwaitFullSyncCompletion("Restarted sync.")); |
| 161 ASSERT_TRUE(ModelMatchesVerifier(0)); | 161 ASSERT_TRUE(ModelMatchesVerifier(0)); |
| 162 ASSERT_EQ(0, GetClient(0)->GetStatus().unsynced_count); | |
| 163 } | 162 } |
| OLD | NEW |