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

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

Issue 2791793002: [Sync] Fix flaky TwoClientAutofillSyncTest.ConflictingFields. (Closed)
Patch Set: Updated for Pavel's comment. Created 3 years, 8 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/sync_test.cc
diff --git a/chrome/browser/sync/test/integration/sync_test.cc b/chrome/browser/sync/test/integration/sync_test.cc
index 18c4a0cca0cc634e7b14044f46bbf47c32d2539e..ff0126c7b5a6c0a81823a5e8ce10cf84543d291f 100644
--- a/chrome/browser/sync/test/integration/sync_test.cc
+++ b/chrome/browser/sync/test/integration/sync_test.cc
@@ -215,7 +215,6 @@ SyncTest::SyncTest(TestType test_type)
server_type_(SERVER_TYPE_UNDECIDED),
num_clients_(-1),
use_verifier_(true),
- notifications_enabled_(true),
create_gaia_account_at_runtime_(false) {
sync_datatype_helper::AssociateWithTest(this);
switch (test_type_) {
@@ -1120,7 +1119,6 @@ void SyncTest::DisableNotificationsImpl() {
void SyncTest::DisableNotifications() {
DisableNotificationsImpl();
- notifications_enabled_ = false;
}
void SyncTest::EnableNotificationsImpl() {
@@ -1135,7 +1133,6 @@ void SyncTest::EnableNotificationsImpl() {
void SyncTest::EnableNotifications() {
EnableNotificationsImpl();
- notifications_enabled_ = true;
}
void SyncTest::TriggerNotification(syncer::ModelTypeSet changed_types) {

Powered by Google App Engine
This is Rietveld 408576698