| 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 cdf3d5834af4d0a64d44c892c0f08165fac15aea..fb67581fdf9c493764d3df612aeba784c2fc2b2e 100644
|
| --- a/chrome/browser/sync/glue/sync_backend_host.h
|
| +++ b/chrome/browser/sync/glue/sync_backend_host.h
|
| @@ -224,9 +224,6 @@ class SyncBackendHost {
|
| // ONLY CALL THIS IF OnInitializationComplete was called!
|
| bool HasUnsyncedItems() const;
|
|
|
| - // Logs the unsynced items.
|
| - void LogUnsyncedItems(int level) const;
|
| -
|
| // Whether or not we are syncing encryption keys.
|
| bool IsNigoriEnabled() const;
|
|
|
| @@ -259,12 +256,6 @@ class SyncBackendHost {
|
| // SyncManager::Observer implementation. The Core just acts like an air
|
| // traffic controller here, forwarding incoming messages to appropriate
|
| // landing threads.
|
| - virtual void OnChangesApplied(
|
| - syncable::ModelType model_type,
|
| - const sync_api::BaseTransaction* trans,
|
| - const sync_api::ImmutableChangeRecordList& changes) OVERRIDE;
|
| - virtual void OnChangesComplete(
|
| - syncable::ModelType model_type) OVERRIDE;
|
| virtual void OnSyncCycleCompleted(
|
| const sessions::SyncSessionSnapshot* snapshot) OVERRIDE;
|
| virtual void OnInitializationComplete(
|
| @@ -287,6 +278,7 @@ class SyncBackendHost {
|
|
|
| struct DoInitializeOptions {
|
| DoInitializeOptions(
|
| + MessageLoop* sync_loop,
|
| SyncBackendRegistrar* registrar,
|
| const WeakHandle<JsEventHandler>& event_handler,
|
| const GURL& service_url,
|
| @@ -298,6 +290,7 @@ class SyncBackendHost {
|
| bool setup_for_test_mode);
|
| ~DoInitializeOptions();
|
|
|
| + MessageLoop* sync_loop;
|
| SyncBackendRegistrar* registrar;
|
| WeakHandle<JsEventHandler> event_handler;
|
| GURL service_url;
|
| @@ -449,6 +442,10 @@ class SyncBackendHost {
|
| // Our parent SyncBackendHost
|
| SyncBackendHost* host_;
|
|
|
| + // The loop where all the sync backend operations happen.
|
| + // Non-NULL only between calls to DoInitialize() and DoShutdown().
|
| + MessageLoop* sync_loop_;
|
| +
|
| // Our parent's registrar (not owned). Non-NULL only between
|
| // calls to DoInitialize() and DoShutdown().
|
| SyncBackendRegistrar* registrar_;
|
| @@ -481,8 +478,6 @@ class SyncBackendHost {
|
| virtual sync_api::HttpPostProviderFactory* MakeHttpBridgeFactory(
|
| const scoped_refptr<net::URLRequestContextGetter>& getter);
|
|
|
| - MessageLoop* sync_loop() { return sync_thread_.message_loop(); }
|
| -
|
| // 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
|
|
|