[Sync] Try to fix race conditions in CookieJarMismatch.

components/sync/driver/glue/sync_backend_host_impl.h

 // Copyright 2013 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.
 
 #ifndef COMPONENTS_SYNC_DRIVER_GLUE_SYNC_BACKEND_HOST_IMPL_H_
 #define COMPONENTS_SYNC_DRIVER_GLUE_SYNC_BACKEND_HOST_IMPL_H_
 
 #include <stdint.h>
 
 #include <map>
@@ skipping 73 matching lines @@
   bool IsCryptographerReady(const BaseTransaction* trans) const override;
   void GetModelSafeRoutingInfo(ModelSafeRoutingInfo* out) const override;
   void FlushDirectory() const override;
   void RequestBufferedProtocolEventsAndEnableForwarding() override;
   void DisableProtocolEventForwarding() override;
   void EnableDirectoryTypeDebugInfoForwarding() override;
   void DisableDirectoryTypeDebugInfoForwarding() override;
   void RefreshTypesForTest(ModelTypeSet types) override;
   void ClearServerData(
       const SyncManager::ClearServerDataCallback& callback) override;
-  void OnCookieJarChanged(bool account_mismatch, bool empty_jar) override;
+  void OnCookieJarChanged(bool account_mismatch,
+                          bool empty_jar,
+                          const base::Closure& callback) override;
 
   // InvalidationHandler implementation.
   void OnInvalidatorStateChange(InvalidatorState state) override;
   void OnIncomingInvalidation(
       const ObjectIdInvalidationMap& invalidation_map) override;
   std::string GetOwnerName() const override;
 
  protected:
   // The types and functions below are protected so that test
   // subclasses can use them.
@@ skipping 81 matching lines @@
   // Handle a migration request.
   void HandleMigrationRequestedOnFrontendLoop(const ModelTypeSet types);
 
   // Dispatched to from OnConnectionStatusChange to handle updating
   // frontend UI components.
   void HandleConnectionStatusChangeOnFrontendLoop(ConnectionStatus status);
 
   void ClearServerDataDoneOnFrontendLoop(
       const SyncManager::ClearServerDataCallback& frontend_callback);
 
+  void OnCookieJarChangedDoneOnFrontendLoop(const base::Closure& callback);
+
   SyncClient* const sync_client_;
 
   // The task runner where all the sync engine operations happen.
   scoped_refptr<base::SingleThreadTaskRunner> sync_task_runner_;
 
   // Name used for debugging (set from profile_->GetDebugName()).
   const std::string name_;
 
   // Our core, which communicates directly to the syncapi. Use refptr instead
   // of WeakHandle because |core_| is created on UI loop but released on
@@ skipping 22 matching lines @@
   base::ThreadChecker thread_checker_;
 
   base::WeakPtrFactory<SyncBackendHostImpl> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(SyncBackendHostImpl);
 };
 
 }  // namespace syncer
 
 #endif  // COMPONENTS_SYNC_DRIVER_GLUE_SYNC_BACKEND_HOST_IMPL_H_