OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "sync/sessions/session_state.h" | 5 #include "sync/sessions/session_state.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 | 8 |
9 #include "base/base64.h" | 9 #include "base/base64.h" |
10 #include "base/memory/scoped_ptr.h" | 10 #include "base/memory/scoped_ptr.h" |
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
83 download_progress_markers, | 83 download_progress_markers, |
84 kHasMoreToSync, | 84 kHasMoreToSync, |
85 kIsSilenced, | 85 kIsSilenced, |
86 kNumEncryptionConflicts, | 86 kNumEncryptionConflicts, |
87 kNumHierarchyConflicts, | 87 kNumHierarchyConflicts, |
88 kNumSimpleConflicts, | 88 kNumSimpleConflicts, |
89 kNumServerConflicts, | 89 kNumServerConflicts, |
90 source, | 90 source, |
91 false, | 91 false, |
92 0, | 92 0, |
93 base::Time::Now()); | 93 base::Time::Now(), |
| 94 false); |
94 scoped_ptr<DictionaryValue> value(snapshot.ToValue()); | 95 scoped_ptr<DictionaryValue> value(snapshot.ToValue()); |
95 EXPECT_EQ(20u, value->size()); | 96 EXPECT_EQ(20u, value->size()); |
96 ExpectDictIntegerValue(model_neutral.num_successful_commits, | 97 ExpectDictIntegerValue(model_neutral.num_successful_commits, |
97 *value, "numSuccessfulCommits"); | 98 *value, "numSuccessfulCommits"); |
98 ExpectDictIntegerValue(model_neutral.num_successful_bookmark_commits, | 99 ExpectDictIntegerValue(model_neutral.num_successful_bookmark_commits, |
99 *value, "numSuccessfulBookmarkCommits"); | 100 *value, "numSuccessfulBookmarkCommits"); |
100 ExpectDictIntegerValue(model_neutral.num_updates_downloaded_total, | 101 ExpectDictIntegerValue(model_neutral.num_updates_downloaded_total, |
101 *value, "numUpdatesDownloadedTotal"); | 102 *value, "numUpdatesDownloadedTotal"); |
102 ExpectDictIntegerValue(model_neutral.num_tombstone_updates_downloaded_total, | 103 ExpectDictIntegerValue(model_neutral.num_tombstone_updates_downloaded_total, |
103 *value, "numTombstoneUpdatesDownloadedTotal"); | 104 *value, "numTombstoneUpdatesDownloadedTotal"); |
(...skipping 20 matching lines...) Expand all Loading... |
124 "numSimpleConflicts"); | 125 "numSimpleConflicts"); |
125 ExpectDictIntegerValue(kNumServerConflicts, *value, | 126 ExpectDictIntegerValue(kNumServerConflicts, *value, |
126 "numServerConflicts"); | 127 "numServerConflicts"); |
127 ExpectDictDictionaryValue(*expected_source_value, *value, "source"); | 128 ExpectDictDictionaryValue(*expected_source_value, *value, "source"); |
128 ExpectDictBooleanValue(false, *value, "notificationsEnabled"); | 129 ExpectDictBooleanValue(false, *value, "notificationsEnabled"); |
129 } | 130 } |
130 | 131 |
131 } // namespace | 132 } // namespace |
132 } // namespace sessions | 133 } // namespace sessions |
133 } // namespace syncer | 134 } // namespace syncer |
OLD | NEW |