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

Side by Side Diff: chrome/browser/sync/test/integration/single_client_bookmarks_sync_test.cc

Issue 9729012: Reland 127510 - Enable tab sync on all platforms by default. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 132 matching lines...) Expand 10 before | Expand all | Expand 10 after
143 GURL("http://www.wynnlasvegas.com")); 143 GURL("http://www.wynnlasvegas.com"));
144 144
145 Move(0, wynn, tier3_b, 0); 145 Move(0, wynn, tier3_b, 0);
146 Move(0, leafs, tier3_b, 0); 146 Move(0, leafs, tier3_b, 0);
147 ASSERT_TRUE(GetClient(0)->AwaitFullSyncCompletion( 147 ASSERT_TRUE(GetClient(0)->AwaitFullSyncCompletion(
148 "Move after addition of bookmarks.")); 148 "Move after addition of bookmarks."));
149 ASSERT_TRUE(ModelMatchesVerifier(0)); 149 ASSERT_TRUE(ModelMatchesVerifier(0));
150 } 150 }
151 151
152 // Restart the sync service on a client and make sure sync is up and running. 152 // Restart the sync service on a client and make sure sync is up and running.
153 IN_PROC_BROWSER_TEST_F(SingleClientBookmarksSyncTest, RestartSyncService) { 153 IN_PROC_BROWSER_TEST_F(SingleClientBookmarksSyncTest,
154 DISABLED_RestartSyncService) {
154 ASSERT_TRUE(SetupSync()) << "SetupSync() failed."; 155 ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
155 156
156 ASSERT_TRUE(AddURL(0, L"Google", GURL("http://www.google.com"))); 157 ASSERT_TRUE(AddURL(0, L"Google", GURL("http://www.google.com")));
157 ASSERT_TRUE(GetClient(0)->AwaitFullSyncCompletion("Added a bookmark.")); 158 ASSERT_TRUE(GetClient(0)->AwaitFullSyncCompletion("Added a bookmark."));
158 ASSERT_TRUE(ModelMatchesVerifier(0)); 159 ASSERT_TRUE(ModelMatchesVerifier(0));
159 ASSERT_EQ(ProfileSyncService::Status::READY, 160 ASSERT_EQ(ProfileSyncService::Status::READY,
160 GetClient(0)->GetStatus().summary); 161 GetClient(0)->GetStatus().summary);
161 162
162 RestartSyncService(0); 163 RestartSyncService(0);
163 ASSERT_TRUE(GetClient(0)->AwaitFullSyncCompletion("Restarted sync.")); 164 ASSERT_TRUE(GetClient(0)->AwaitFullSyncCompletion("Restarted sync."));
164 ASSERT_TRUE(ModelMatchesVerifier(0)); 165 ASSERT_TRUE(ModelMatchesVerifier(0));
165 ASSERT_EQ(ProfileSyncService::Status::READY, 166 ASSERT_EQ(ProfileSyncService::Status::READY,
166 GetClient(0)->GetStatus().summary); 167 GetClient(0)->GetStatus().summary);
167 ASSERT_EQ(0, GetClient(0)->GetStatus().unsynced_count); 168 ASSERT_EQ(0, GetClient(0)->GetStatus().unsynced_count);
168 } 169 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698