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

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

Issue 10833004: [Sync] Make P2PNotifier emit a notification only if some enabled types changed (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed MC_DeleteBookmarks Created 8 years, 5 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
Index: chrome/browser/sync/test/integration/two_client_extensions_sync_test.cc
diff --git a/chrome/browser/sync/test/integration/two_client_extensions_sync_test.cc b/chrome/browser/sync/test/integration/two_client_extensions_sync_test.cc
index 0311bdc72067fc79cbaa2ef2b6a9c791be707cc6..0476fa261dec2dd215ce9aae39ef83b500408812 100644
--- a/chrome/browser/sync/test/integration/two_client_extensions_sync_test.cc
+++ b/chrome/browser/sync/test/integration/two_client_extensions_sync_test.cc
@@ -247,7 +247,8 @@ IN_PROC_BROWSER_TEST_F(TwoClientExtensionsSyncTest, DisableExtensions) {
ASSERT_TRUE(GetClient(1)->DisableSyncForDatatype(syncer::EXTENSIONS));
InstallExtension(GetProfile(0), 1);
InstallExtension(verifier(), 1);
- ASSERT_TRUE(AwaitQuiescence());
+ ASSERT_TRUE(
+ GetClient(0)->AwaitFullSyncCompletion("Installed an extension."));
ASSERT_FALSE(AllProfilesHaveSameExtensionsAsVerifier());
ASSERT_TRUE(GetClient(1)->EnableSyncForDatatype(syncer::EXTENSIONS));

Powered by Google App Engine
This is Rietveld 408576698