[Sync] Move sessions/ to engine/cycle/ and rename things to match.

components/sync/engine_impl/backoff_delay_provider.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/sync/engine_impl/backoff_delay_provider.h"
 
 #include <stdint.h>
 
 #include <algorithm>
 
 #include "base/rand_util.h"
 #include "components/sync/base/syncer_error.h"
+#include "components/sync/engine/cycle/model_neutral_state.h"
 #include "components/sync/engine/polling_constants.h"
-#include "components/sync/sessions/model_neutral_state.h"
 
 using base::TimeDelta;
 
 namespace syncer {
 
 // static
 BackoffDelayProvider* BackoffDelayProvider::FromDefaults() {
   return new BackoffDelayProvider(
       TimeDelta::FromSeconds(kInitialBackoffRetrySeconds),
       TimeDelta::FromSeconds(kInitialBackoffImmediateRetrySeconds));
@@ skipping 32 matching lines @@
       (rand_sign * (last_delay.InSeconds() / kBackoffRandomizationFactor));
 
   // Cap the backoff interval.
   backoff_s = std::max(static_cast<int64_t>(1),
                        std::min(backoff_s, kMaxBackoffSeconds));
 
   return TimeDelta::FromSeconds(backoff_s);
 }
 
 TimeDelta BackoffDelayProvider::GetInitialDelay(
-    const sessions::ModelNeutralState& state) const {
+    const ModelNeutralState& state) const {
   // NETWORK_CONNECTION_UNAVAILABLE implies we did not receive HTTP response
   // from server because of some network error. If network is unavailable then
   // on next connection type or address change scheduler will run canary job.
   // Otherwise we'll retry in 30 seconds.
   if (state.commit_result == NETWORK_CONNECTION_UNAVAILABLE ||
       state.last_download_updates_result == NETWORK_CONNECTION_UNAVAILABLE) {
     return default_initial_backoff_;
   }
 
   if (SyncerErrorIsError(state.last_get_key_result))
@@ skipping 22 matching lines @@
   // TODO(sync): We shouldn't need to handle this in BackoffDelayProvider.
   // There should be a way to deal with protocol errors before we get to this
   // point.
   if (state.commit_result == SERVER_RETURN_CONFLICT)
     return short_initial_backoff_;
 
   return default_initial_backoff_;
 }
 
 }  // namespace syncer