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

components/sync/engine_impl/backoff_delay_provider_unittest.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 <memory>
 
 #include "base/time/time.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"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using base::TimeDelta;
 
 namespace syncer {
 
 class BackoffDelayProviderTest : public testing::Test {};
 
 TEST_F(BackoffDelayProviderTest, GetRecommendedDelay) {
   std::unique_ptr<BackoffDelayProvider> delay(
       BackoffDelayProvider::FromDefaults());
   EXPECT_EQ(TimeDelta::FromSeconds(1),
             delay->GetDelay(TimeDelta::FromSeconds(0)));
   EXPECT_LE(TimeDelta::FromSeconds(1),
             delay->GetDelay(TimeDelta::FromSeconds(1)));
   EXPECT_LE(TimeDelta::FromSeconds(50),
             delay->GetDelay(TimeDelta::FromSeconds(50)));
   EXPECT_LE(TimeDelta::FromSeconds(10),
             delay->GetDelay(TimeDelta::FromSeconds(10)));
   EXPECT_EQ(TimeDelta::FromSeconds(kMaxBackoffSeconds),
             delay->GetDelay(TimeDelta::FromSeconds(kMaxBackoffSeconds)));
   EXPECT_EQ(TimeDelta::FromSeconds(kMaxBackoffSeconds),
             delay->GetDelay(TimeDelta::FromSeconds(kMaxBackoffSeconds + 1)));
 }
 
 TEST_F(BackoffDelayProviderTest, GetInitialDelay) {
   std::unique_ptr<BackoffDelayProvider> delay(
       BackoffDelayProvider::FromDefaults());
-  sessions::ModelNeutralState state;
+  ModelNeutralState state;
   state.last_get_key_result = SYNC_SERVER_ERROR;
   EXPECT_EQ(kInitialBackoffRetrySeconds,
             delay->GetInitialDelay(state).InSeconds());
 
   state.last_get_key_result = UNSET;
   state.last_download_updates_result = SERVER_RETURN_MIGRATION_DONE;
   EXPECT_EQ(kInitialBackoffImmediateRetrySeconds,
             delay->GetInitialDelay(state).InSeconds());
 
   state.last_download_updates_result = NETWORK_CONNECTION_UNAVAILABLE;
@@ skipping 29 matching lines @@
             delay->GetInitialDelay(state).InSeconds());
 
   state.commit_result = SERVER_RETURN_CONFLICT;
   EXPECT_EQ(kInitialBackoffImmediateRetrySeconds,
             delay->GetInitialDelay(state).InSeconds());
 }
 
 TEST_F(BackoffDelayProviderTest, GetInitialDelayWithOverride) {
   std::unique_ptr<BackoffDelayProvider> delay(
       BackoffDelayProvider::WithShortInitialRetryOverride());
-  sessions::ModelNeutralState state;
+  ModelNeutralState state;
   state.last_get_key_result = SYNC_SERVER_ERROR;
   EXPECT_EQ(kInitialBackoffShortRetrySeconds,
             delay->GetInitialDelay(state).InSeconds());
 
   state.last_get_key_result = UNSET;
   state.last_download_updates_result = SERVER_RETURN_MIGRATION_DONE;
   EXPECT_EQ(kInitialBackoffImmediateRetrySeconds,
             delay->GetInitialDelay(state).InSeconds());
 
   state.last_download_updates_result = SERVER_RETURN_TRANSIENT_ERROR;
@@ skipping 19 matching lines @@
   state.commit_result = SERVER_RETURN_MIGRATION_DONE;
   EXPECT_EQ(kInitialBackoffImmediateRetrySeconds,
             delay->GetInitialDelay(state).InSeconds());
 
   state.commit_result = SERVER_RETURN_CONFLICT;
   EXPECT_EQ(kInitialBackoffImmediateRetrySeconds,
             delay->GetInitialDelay(state).InSeconds());
 }
 
 }  // namespace syncer