Index: sync/engine/sync_scheduler_impl.cc |
diff --git a/sync/engine/sync_scheduler_impl.cc b/sync/engine/sync_scheduler_impl.cc |
index 72f8243639260e5a15d7261c9555b2c5f992e101..ec7143de6a9cfc49946833c7173ff747586bad42 100644 |
--- a/sync/engine/sync_scheduler_impl.cc |
+++ b/sync/engine/sync_scheduler_impl.cc |
@@ -65,18 +65,15 @@ bool IsActionableError( |
} // namespace |
ConfigurationParams::ConfigurationParams() |
- : source(GetUpdatesCallerInfo::UNKNOWN), |
- keystore_key_status(KEYSTORE_KEY_UNNECESSARY) {} |
+ : source(GetUpdatesCallerInfo::UNKNOWN) {} |
ConfigurationParams::ConfigurationParams( |
const sync_pb::GetUpdatesCallerInfo::GetUpdatesSource& source, |
const ModelTypeSet& types_to_download, |
const ModelSafeRoutingInfo& routing_info, |
- KeystoreKeyStatus keystore_key_status, |
const base::Closure& ready_task) |
: source(source), |
types_to_download(types_to_download), |
routing_info(routing_info), |
- keystore_key_status(keystore_key_status), |
ready_task(ready_task) { |
DCHECK(!ready_task.is_null()); |
} |
@@ -353,12 +350,6 @@ bool SyncSchedulerImpl::ScheduleConfiguration( |
&restricted_workers); |
session_context_->set_routing_info(params.routing_info); |
- if (params.keystore_key_status == ConfigurationParams::KEYSTORE_KEY_NEEDED) { |
- // TODO(zea): implement in such a way that we can handle failures and the |
- // subsequent retrys the scheduler might perform. See crbug.com/129665. |
- NOTIMPLEMENTED(); |
- } |
- |
// Only reconfigure if we have types to download. |
if (!params.types_to_download.Empty()) { |
DCHECK(!restricted_routes.empty()); |