[Sync] Fix flaky TwoClientAutofillSyncTest.ConflictingFields.

chrome/browser/sync/test/integration/sync_test.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/sync/test/integration/sync_test.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <limits>
@@ skipping 197 matching lines @@
   return BuildP2PProfileInvalidationProvider(context, syncer::NOTIFY_OTHERS);
 }
 
 }  // namespace
 
 SyncTest::SyncTest(TestType test_type)
     : test_type_(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_) {
     case SINGLE_CLIENT:
     case SINGLE_CLIENT_LEGACY: {
       num_clients_ = 1;
       break;
     }
     case TWO_CLIENT:
     case TWO_CLIENT_LEGACY: {
@@ skipping 884 matching lines @@
   std::string path = "chromiumsync/disablenotifications";
   ui_test_utils::NavigateToURL(browser(), sync_server_.GetURL(path));
   ASSERT_EQ("Notifications disabled",
             base::UTF16ToASCII(
                 browser()->tab_strip_model()->GetActiveWebContents()->
                     GetTitle()));
 }
 
 void SyncTest::DisableNotifications() {
   DisableNotificationsImpl();
-  notifications_enabled_ = false;
 }
 
 void SyncTest::EnableNotificationsImpl() {
   ASSERT_TRUE(ServerSupportsNotificationControl());
   std::string path = "chromiumsync/enablenotifications";
   ui_test_utils::NavigateToURL(browser(), sync_server_.GetURL(path));
   ASSERT_EQ("Notifications enabled",
             base::UTF16ToASCII(
                 browser()->tab_strip_model()->GetActiveWebContents()->
                     GetTitle()));
 }
 
 void SyncTest::EnableNotifications() {
   EnableNotificationsImpl();
-  notifications_enabled_ = true;
 }
 
 void SyncTest::TriggerNotification(syncer::ModelTypeSet changed_types) {
   ASSERT_TRUE(ServerSupportsNotificationControl());
   const std::string& data =
       syncer::P2PNotificationData(
           "from_server",
           syncer::NOTIFY_ALL,
           syncer::ObjectIdInvalidationMap::InvalidateAll(
               syncer::ModelTypeSetToObjectIdSet(changed_types))).ToString();
@@ skipping 74 matching lines @@
 bool SyncTest::ClearServerData(ProfileSyncServiceHarness* harness) {
   // At this point our birthday is good.
   base::RunLoop run_loop;
   harness->service()->ClearServerDataForTest(run_loop.QuitClosure());
   run_loop.Run();
 
   // Our birthday is invalidated on the server here so restart sync to get
   // the new birthday from the server.
   return harness->RestartSyncService();
 }