| Index: components/sync/sessions/sync_session_snapshot_unittest.cc
|
| diff --git a/sync/internal_api/public/sessions/sync_session_snapshot_unittest.cc b/components/sync/sessions/sync_session_snapshot_unittest.cc
|
| similarity index 80%
|
| rename from sync/internal_api/public/sessions/sync_session_snapshot_unittest.cc
|
| rename to components/sync/sessions/sync_session_snapshot_unittest.cc
|
| index 1bb2e3bb1b0c8edb676a89bb849f4e46ec1b61d6..7410df82b525f45ed83980c118f719a0a8f36c6c 100644
|
| --- a/sync/internal_api/public/sessions/sync_session_snapshot_unittest.cc
|
| +++ b/components/sync/sessions/sync_session_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 "sync/internal_api/public/sessions/sync_session_snapshot.h"
|
| +#include "components/sync/sessions/sync_session_snapshot.h"
|
|
|
| #include <memory>
|
| #include <vector>
|
| @@ -54,29 +54,28 @@ TEST_F(SyncSessionSnapshotTest, SyncSessionSnapshotToValue) {
|
| sync_pb::GetUpdatesCallerInfo::UNKNOWN);
|
| std::unique_ptr<base::DictionaryValue> value(snapshot.ToValue());
|
| EXPECT_EQ(16u, value->size());
|
| - ExpectDictIntegerValue(model_neutral.num_successful_commits,
|
| - *value, "numSuccessfulCommits");
|
| - ExpectDictIntegerValue(model_neutral.num_successful_bookmark_commits,
|
| - *value, "numSuccessfulBookmarkCommits");
|
| - ExpectDictIntegerValue(model_neutral.num_updates_downloaded_total,
|
| - *value, "numUpdatesDownloadedTotal");
|
| + ExpectDictIntegerValue(model_neutral.num_successful_commits, *value,
|
| + "numSuccessfulCommits");
|
| + ExpectDictIntegerValue(model_neutral.num_successful_bookmark_commits, *value,
|
| + "numSuccessfulBookmarkCommits");
|
| + ExpectDictIntegerValue(model_neutral.num_updates_downloaded_total, *value,
|
| + "numUpdatesDownloadedTotal");
|
| ExpectDictIntegerValue(model_neutral.num_tombstone_updates_downloaded_total,
|
| *value, "numTombstoneUpdatesDownloadedTotal");
|
| ExpectDictIntegerValue(model_neutral.num_reflected_updates_downloaded_total,
|
| *value, "numReflectedUpdatesDownloadedTotal");
|
| - ExpectDictIntegerValue(model_neutral.num_local_overwrites,
|
| - *value, "numLocalOverwrites");
|
| - ExpectDictIntegerValue(model_neutral.num_server_overwrites,
|
| - *value, "numServerOverwrites");
|
| - ExpectDictDictionaryValue(*expected_download_progress_markers_value,
|
| - *value, "downloadProgressMarkers");
|
| + ExpectDictIntegerValue(model_neutral.num_local_overwrites, *value,
|
| + "numLocalOverwrites");
|
| + ExpectDictIntegerValue(model_neutral.num_server_overwrites, *value,
|
| + "numServerOverwrites");
|
| + ExpectDictDictionaryValue(*expected_download_progress_markers_value, *value,
|
| + "downloadProgressMarkers");
|
| ExpectDictBooleanValue(kIsSilenced, *value, "isSilenced");
|
| ExpectDictIntegerValue(kNumEncryptionConflicts, *value,
|
| "numEncryptionConflicts");
|
| ExpectDictIntegerValue(kNumHierarchyConflicts, *value,
|
| "numHierarchyConflicts");
|
| - ExpectDictIntegerValue(kNumServerConflicts, *value,
|
| - "numServerConflicts");
|
| + ExpectDictIntegerValue(kNumServerConflicts, *value, "numServerConflicts");
|
| ExpectDictBooleanValue(false, *value, "notificationsEnabled");
|
| }
|
|
|
|
|