| Index: components/sync/engine/cycle/sync_cycle_snapshot_unittest.cc
|
| diff --git a/components/sync/sessions/sync_session_snapshot_unittest.cc b/components/sync/engine/cycle/sync_cycle_snapshot_unittest.cc
|
| similarity index 80%
|
| rename from components/sync/sessions/sync_session_snapshot_unittest.cc
|
| rename to components/sync/engine/cycle/sync_cycle_snapshot_unittest.cc
|
| index 7410df82b525f45ed83980c118f719a0a8f36c6c..94d62955a36c8123f26fc5221667ce7468f1c0ec 100644
|
| --- a/components/sync/sessions/sync_session_snapshot_unittest.cc
|
| +++ b/components/sync/engine/cycle/sync_cycle_snapshot_unittest.cc
|
| @@ -2,7 +2,7 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "components/sync/sessions/sync_session_snapshot.h"
|
| +#include "components/sync/engine/cycle/sync_cycle_snapshot.h"
|
|
|
| #include <memory>
|
| #include <vector>
|
| @@ -12,7 +12,6 @@
|
| #include "testing/gtest/include/gtest/gtest.h"
|
|
|
| namespace syncer {
|
| -namespace sessions {
|
| namespace {
|
|
|
| using base::ExpectDictBooleanValue;
|
| @@ -21,9 +20,9 @@ using base::ExpectDictIntegerValue;
|
| using base::ExpectDictListValue;
|
| using base::ExpectDictStringValue;
|
|
|
| -class SyncSessionSnapshotTest : public testing::Test {};
|
| +class SyncCycleSnapshotTest : public testing::Test {};
|
|
|
| -TEST_F(SyncSessionSnapshotTest, SyncSessionSnapshotToValue) {
|
| +TEST_F(SyncCycleSnapshotTest, SyncCycleSnapshotToValue) {
|
| ModelNeutralState model_neutral;
|
| model_neutral.num_successful_commits = 5;
|
| model_neutral.num_successful_bookmark_commits = 10;
|
| @@ -45,13 +44,13 @@ TEST_F(SyncSessionSnapshotTest, SyncSessionSnapshotToValue) {
|
| const int kNumHierarchyConflicts = 1055;
|
| const int kNumServerConflicts = 1057;
|
|
|
| - SyncSessionSnapshot snapshot(model_neutral, download_progress_markers,
|
| - kIsSilenced, kNumEncryptionConflicts,
|
| - kNumHierarchyConflicts, kNumServerConflicts,
|
| - false, 0, base::Time::Now(), base::Time::Now(),
|
| - std::vector<int>(MODEL_TYPE_COUNT, 0),
|
| - std::vector<int>(MODEL_TYPE_COUNT, 0),
|
| - sync_pb::GetUpdatesCallerInfo::UNKNOWN);
|
| + SyncCycleSnapshot snapshot(model_neutral, download_progress_markers,
|
| + kIsSilenced, kNumEncryptionConflicts,
|
| + kNumHierarchyConflicts, kNumServerConflicts, false,
|
| + 0, base::Time::Now(), base::Time::Now(),
|
| + std::vector<int>(MODEL_TYPE_COUNT, 0),
|
| + std::vector<int>(MODEL_TYPE_COUNT, 0),
|
| + sync_pb::GetUpdatesCallerInfo::UNKNOWN);
|
| std::unique_ptr<base::DictionaryValue> value(snapshot.ToValue());
|
| EXPECT_EQ(16u, value->size());
|
| ExpectDictIntegerValue(model_neutral.num_successful_commits, *value,
|
| @@ -80,5 +79,4 @@ TEST_F(SyncSessionSnapshotTest, SyncSessionSnapshotToValue) {
|
| }
|
|
|
| } // namespace
|
| -} // namespace sessions
|
| } // namespace syncer
|
|
|