Merge 136934 - Notify sync observers whenever preferred types change

chrome/browser/sync/profile_sync_service_harness.h

Index: chrome/browser/sync/profile_sync_service_harness.h
===================================================================
--- chrome/browser/sync/profile_sync_service_harness.h	(revision 137481)
+++ chrome/browser/sync/profile_sync_service_harness.h	(working copy)
@@ -359,6 +359,11 @@
   // related bookkeeping information for verification.
   browser_sync::RetryVerifier retry_verifier_;
 
+  // Flag set to true when we're waiting for a status change to happen. Used to
+  // avoid triggering internal state machine logic on unexpected sync observer
+  // callbacks.
+  bool waiting_for_status_change_;
+
   DISALLOW_COPY_AND_ASSIGN(ProfileSyncServiceHarness);
 };