| Index: sync/engine/sync_scheduler.h
|
| diff --git a/sync/engine/sync_scheduler.h b/sync/engine/sync_scheduler.h
|
| index e706a8cf2efa0e3d7932b1999a8f607b91b3f54b..4cb65c955d24cbc6e8fa362dbb9f77bc658d7cc3 100644
|
| --- a/sync/engine/sync_scheduler.h
|
| +++ b/sync/engine/sync_scheduler.h
|
| @@ -37,16 +37,11 @@ namespace syncer {
|
| struct ServerConnectionEvent;
|
|
|
| struct ConfigurationParams {
|
| - enum KeystoreKeyStatus {
|
| - KEYSTORE_KEY_UNNECESSARY,
|
| - KEYSTORE_KEY_NEEDED
|
| - };
|
| ConfigurationParams();
|
| ConfigurationParams(
|
| const sync_pb::GetUpdatesCallerInfo::GetUpdatesSource& source,
|
| const syncer::ModelTypeSet& types_to_download,
|
| const syncer::ModelSafeRoutingInfo& routing_info,
|
| - KeystoreKeyStatus keystore_key_status,
|
| const base::Closure& ready_task);
|
| ~ConfigurationParams();
|
|
|
| @@ -56,8 +51,6 @@ struct ConfigurationParams {
|
| syncer::ModelTypeSet types_to_download;
|
| // The new routing info (superset of types to be downloaded).
|
| ModelSafeRoutingInfo routing_info;
|
| - // Whether we need to perform a GetKey command.
|
| - KeystoreKeyStatus keystore_key_status;
|
| // Callback to invoke on configuration completion.
|
| base::Closure ready_task;
|
| };
|
|
|