[Sync] Split DirectoryChangeListener for thread-safety

chrome/browser/sync/glue/sync_backend_host.h

Index: chrome/browser/sync/glue/sync_backend_host.h
diff --git a/chrome/browser/sync/glue/sync_backend_host.h b/chrome/browser/sync/glue/sync_backend_host.h
index d9c0ae5c3c5c74575d9868d1c28f7257c22f7d6e..5252597a83cfb7b51d36b3e7d9cf55262c9a166b 100644
--- a/chrome/browser/sync/glue/sync_backend_host.h
+++ b/chrome/browser/sync/glue/sync_backend_host.h
@@ -398,7 +398,7 @@ class SyncBackendHost : public browser_sync::ModelSafeWorkerRegistrar {
     // This method will add a reference to the context to persist it
     // on the IO thread. Must be removed from IO thread.
 
-    sync_api::SyncManager* syncapi() { return syncapi_.get(); }
+    sync_api::SyncManager* sync_manager() { return sync_manager_.get(); }
 
     // Delete the sync data folder to cleanup backend data.  Happens the first
     // time sync is enabled for a user (to prevent accidentally reusing old
@@ -489,7 +489,7 @@ class SyncBackendHost : public browser_sync::ModelSafeWorkerRegistrar {
 
     // Called from Core::OnInitializationComplete to handle updating
     // frontend thread components.
-    void HandleInitalizationCompletedOnFrontendLoop();
+    void HandleInitializationCompletedOnFrontendLoop();
 
     void RouteJsEventOnFrontendLoop(
         const std::string& name, const JsEventDetails& details);
@@ -503,14 +503,16 @@ class SyncBackendHost : public browser_sync::ModelSafeWorkerRegistrar {
     // Return true if a model lives on the current thread.
     bool IsCurrentThreadSafeForModel(syncable::ModelType model_type);
 
+    const std::string name_;

[tim (not reviewing), 2011/06/16 21:10:58]

what is |name_|? name of what?

[akalin, 2011/06/16 22:23:12]

Done.

+
     // Our parent SyncBackendHost
     SyncBackendHost* host_;
 
     // The timer used to periodically call SaveChanges.
     base::RepeatingTimer<Core> save_changes_timer_;
 
-    // The top-level syncapi entry point.
-    scoped_ptr<sync_api::SyncManager> syncapi_;
+    // The top-level syncapi entry point.  Lives on the sync thread.
+    scoped_ptr<sync_api::SyncManager> sync_manager_;

[tim (not reviewing), 2011/06/16 21:10:58]

I prefer the old name :\ but if you really want to change it shouldn't we change
it everywhere lest we make things more confusing? one example - ui_model_worker
still refers to it as "syncapi"

[akalin, 2011/06/16 22:23:12]

Well, the problem with the name "syncapi" is that it's overloaded.  Here it was
used to mean "instance of the SyncManager class", in ui_model_worker, according
to the comments, it's really referring to the sync *thread*, and in other places
(DirectoryChangeDelegate) it's used to mean "from Chrome" as opposed to "from
the cloud".

I'll fix ui_model_worker et al. in a separate CL.

 
     scoped_ptr<sync_notifier::SyncNotifier> sync_notifier_;
 
@@ -553,8 +555,6 @@ class SyncBackendHost : public browser_sync::ModelSafeWorkerRegistrar {
 
   MessageLoop* sync_loop() { return sync_thread_.message_loop(); }
 
-  void set_syncapi_initialized() { syncapi_initialized_ = true; }
-
   // Helpers to persist a token that can be used to bootstrap sync encryption
   // across browser restart to avoid requiring the user to re-enter their
   // passphrase.  |token| must be valid UTF-8 as we use the PrefService for
@@ -654,7 +654,7 @@ class SyncBackendHost : public browser_sync::ModelSafeWorkerRegistrar {
   scoped_ptr<sessions::SyncSessionSnapshot> last_snapshot_;
 
   // Whether we've processed the initialization complete callback.
-  bool syncapi_initialized_;
+  bool sync_manager_initialized_;
 
   DISALLOW_COPY_AND_ASSIGN(SyncBackendHost);
 };