| Index: components/sync/driver/glue/sync_backend_host.h
|
| diff --git a/components/sync_driver/glue/sync_backend_host.h b/components/sync/driver/glue/sync_backend_host.h
|
| similarity index 97%
|
| rename from components/sync_driver/glue/sync_backend_host.h
|
| rename to components/sync/driver/glue/sync_backend_host.h
|
| index 7dbe2b1aea4d115c44d448e7a809d0381df47d71..a78e522e39a523b9b53b46affb358658d8e91e9f 100644
|
| --- a/components/sync_driver/glue/sync_backend_host.h
|
| +++ b/components/sync/driver/glue/sync_backend_host.h
|
| @@ -18,8 +18,8 @@
|
| #include "components/sync/core/shutdown_reason.h"
|
| #include "components/sync/core/sync_manager.h"
|
| #include "components/sync/core/sync_manager_factory.h"
|
| +#include "components/sync/driver/backend_data_type_configurer.h"
|
| #include "components/sync/sessions/sync_session_snapshot.h"
|
| -#include "components/sync_driver/backend_data_type_configurer.h"
|
|
|
| class GURL;
|
|
|
| @@ -104,9 +104,8 @@ class SyncBackendHost : public sync_driver::BackendDataTypeConfigurer {
|
| // passphrase passed in is cached so we can re-encrypt with it in future.
|
| // - If there are no pending keys, data is encrypted with |passphrase| (this
|
| // is a no-op if data was already encrypted with |passphrase|.)
|
| - virtual void SetEncryptionPassphrase(
|
| - const std::string& passphrase,
|
| - bool is_explicit) = 0;
|
| + virtual void SetEncryptionPassphrase(const std::string& passphrase,
|
| + bool is_explicit) = 0;
|
|
|
| // Called on |frontend_loop_| to use the provided passphrase to asynchronously
|
| // attempt decryption. Returns false immediately if the passphrase could not
|
| @@ -165,8 +164,8 @@ class SyncBackendHost : public sync_driver::BackendDataTypeConfigurer {
|
| // Called from any thread to obtain current status information in detailed or
|
| // summarized form.
|
| virtual Status GetDetailedStatus() = 0;
|
| - virtual syncer::sessions::SyncSessionSnapshot
|
| - GetLastSessionSnapshot() const = 0;
|
| + virtual syncer::sessions::SyncSessionSnapshot GetLastSessionSnapshot()
|
| + const = 0;
|
|
|
| // Determines if the underlying sync engine has made any local changes to
|
| // items that have not yet been synced with the server.
|
|
|