sync: Follow-up to conflict resolution refactor

sync/sessions/session_state_unittest.cc

Index: sync/sessions/session_state_unittest.cc
diff --git a/sync/sessions/session_state_unittest.cc b/sync/sessions/session_state_unittest.cc
deleted file mode 100644
index 9d204370dd7bcc6fa56a6540ab818283f807d137..0000000000000000000000000000000000000000
--- a/sync/sessions/session_state_unittest.cc
+++ /dev/null
@@ -1,134 +0,0 @@
-// 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 "sync/sessions/session_state.h"
-
-#include <string>
-
-#include "base/base64.h"
-#include "base/memory/scoped_ptr.h"
-#include "base/test/values_test_util.h"
-#include "base/time.h"
-#include "base/values.h"
-#include "sync/internal_api/public/sessions/sync_session_snapshot.h"
-#include "sync/internal_api/public/sessions/sync_source_info.h"
-#include "testing/gtest/include/gtest/gtest.h"
-
-namespace syncer {
-namespace sessions {
-namespace {
-
-using base::ExpectDictBooleanValue;
-using base::ExpectDictDictionaryValue;
-using base::ExpectDictIntegerValue;
-using base::ExpectDictListValue;
-using base::ExpectDictStringValue;
-
-class SessionStateTest : public testing::Test {};
-
-TEST_F(SessionStateTest, SyncSourceInfoToValue) {
-  sync_pb::GetUpdatesCallerInfo::GetUpdatesSource updates_source =
-      sync_pb::GetUpdatesCallerInfo::PERIODIC;
-  ModelTypeInvalidationMap types;
-  types[PREFERENCES].payload = "preferencespayload";
-  types[EXTENSIONS].payload = "";
-  scoped_ptr<DictionaryValue> expected_types_value(
-      ModelTypeInvalidationMapToValue(types));
-
-  SyncSourceInfo source_info(updates_source, types);
-
-  scoped_ptr<DictionaryValue> value(source_info.ToValue());
-  EXPECT_EQ(2u, value->size());
-  ExpectDictStringValue("PERIODIC", *value, "updatesSource");
-  ExpectDictDictionaryValue(*expected_types_value, *value, "types");
-}
-
-TEST_F(SessionStateTest, SyncSessionSnapshotToValue) {
-  ModelNeutralState model_neutral;
-  model_neutral.num_server_changes_remaining = 105;
-  model_neutral.num_successful_commits = 5;
-  model_neutral.num_successful_bookmark_commits = 10;
-  model_neutral.num_updates_downloaded_total = 100;
-  model_neutral.num_tombstone_updates_downloaded_total = 200;
-  model_neutral.num_reflected_updates_downloaded_total = 50;
-  model_neutral.num_local_overwrites = 15;
-  model_neutral.num_server_overwrites = 18;
-
-  const bool kIsShareUsable = true;
-
-  const ModelTypeSet initial_sync_ended(BOOKMARKS, PREFERENCES);
-  scoped_ptr<ListValue> expected_initial_sync_ended_value(
-      ModelTypeSetToValue(initial_sync_ended));
-
-  ProgressMarkerMap download_progress_markers;
-  download_progress_markers[BOOKMARKS] = "test";
-  download_progress_markers[APPS] = "apps";
-  scoped_ptr<DictionaryValue> expected_download_progress_markers_value(
-      ProgressMarkerMapToValue(download_progress_markers));
-
-  const bool kHasMoreToSync = false;
-  const bool kIsSilenced = true;
-  const int kNumEncryptionConflicts = 1054;
-  const int kNumHierarchyConflicts = 1055;
-  const int kNumSimpleConflicts = 1056;
-  const int kNumServerConflicts = 1057;
-
-  SyncSourceInfo source;
-  scoped_ptr<DictionaryValue> expected_source_value(source.ToValue());
-
-  SyncSessionSnapshot snapshot(model_neutral,
-                               kIsShareUsable,
-                               initial_sync_ended,
-                               download_progress_markers,
-                               kHasMoreToSync,
-                               kIsSilenced,
-                               kNumEncryptionConflicts,
-                               kNumHierarchyConflicts,
-                               kNumSimpleConflicts,
-                               kNumServerConflicts,
-                               source,
-                               false,
-                               0,
-                               base::Time::Now(),
-                               false);
-  scoped_ptr<DictionaryValue> value(snapshot.ToValue());
-  EXPECT_EQ(20u, 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_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");
-  ExpectDictIntegerValue(model_neutral.num_server_changes_remaining,
-                         *value, "numServerChangesRemaining");
-  ExpectDictBooleanValue(kIsShareUsable, *value, "isShareUsable");
-  ExpectDictListValue(*expected_initial_sync_ended_value, *value,
-                      "initialSyncEnded");
-  ExpectDictDictionaryValue(*expected_download_progress_markers_value,
-                            *value, "downloadProgressMarkers");
-  ExpectDictBooleanValue(kHasMoreToSync, *value, "hasMoreToSync");
-  ExpectDictBooleanValue(kIsSilenced, *value, "isSilenced");
-  ExpectDictIntegerValue(kNumEncryptionConflicts, *value,
-                         "numEncryptionConflicts");
-  ExpectDictIntegerValue(kNumHierarchyConflicts, *value,
-                         "numHierarchyConflicts");
-  ExpectDictIntegerValue(kNumSimpleConflicts, *value,
-                         "numSimpleConflicts");
-  ExpectDictIntegerValue(kNumServerConflicts, *value,
-                         "numServerConflicts");
-  ExpectDictDictionaryValue(*expected_source_value, *value, "source");
-  ExpectDictBooleanValue(false, *value, "notificationsEnabled");
-}
-
-}  // namespace
-}  // namespace sessions
-}  // namespace syncer