OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 "chrome/browser/sync/sessions/session_state.h" | 5 #include "chrome/browser/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 141 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
152 kNumServerChangesRemaining, | 152 kNumServerChangesRemaining, |
153 kIsShareUsable, | 153 kIsShareUsable, |
154 initial_sync_ended, | 154 initial_sync_ended, |
155 download_progress_markers, | 155 download_progress_markers, |
156 kHasMoreToSync, | 156 kHasMoreToSync, |
157 kIsSilenced, | 157 kIsSilenced, |
158 kUnsyncedCount, | 158 kUnsyncedCount, |
159 kNumBlockingConflictingUpdates, | 159 kNumBlockingConflictingUpdates, |
160 kNumConflictingUpdates, | 160 kNumConflictingUpdates, |
161 kDidCommitItems, | 161 kDidCommitItems, |
162 source); | 162 source, |
| 163 0); |
163 scoped_ptr<DictionaryValue> value(snapshot.ToValue()); | 164 scoped_ptr<DictionaryValue> value(snapshot.ToValue()); |
164 EXPECT_EQ(13u, value->size()); | 165 EXPECT_EQ(14u, value->size()); |
165 ExpectDictDictionaryValue(*expected_syncer_status_value, *value, | 166 ExpectDictDictionaryValue(*expected_syncer_status_value, *value, |
166 "syncerStatus"); | 167 "syncerStatus"); |
167 ExpectDictDictionaryValue(*expected_errors_value, *value, "errors"); | 168 ExpectDictDictionaryValue(*expected_errors_value, *value, "errors"); |
168 ExpectDictIntegerValue(kNumServerChangesRemaining, *value, | 169 ExpectDictIntegerValue(kNumServerChangesRemaining, *value, |
169 "numServerChangesRemaining"); | 170 "numServerChangesRemaining"); |
170 ExpectDictBooleanValue(kIsShareUsable, *value, "isShareUsable"); | 171 ExpectDictBooleanValue(kIsShareUsable, *value, "isShareUsable"); |
171 ExpectDictListValue(*expected_initial_sync_ended_value, *value, | 172 ExpectDictListValue(*expected_initial_sync_ended_value, *value, |
172 "initialSyncEnded"); | 173 "initialSyncEnded"); |
173 ExpectDictDictionaryValue(*expected_download_progress_markers_value, | 174 ExpectDictDictionaryValue(*expected_download_progress_markers_value, |
174 *value, "downloadProgressMarkers"); | 175 *value, "downloadProgressMarkers"); |
175 ExpectDictBooleanValue(kHasMoreToSync, *value, "hasMoreToSync"); | 176 ExpectDictBooleanValue(kHasMoreToSync, *value, "hasMoreToSync"); |
176 ExpectDictBooleanValue(kIsSilenced, *value, "isSilenced"); | 177 ExpectDictBooleanValue(kIsSilenced, *value, "isSilenced"); |
177 ExpectDictIntegerValue(kUnsyncedCount, *value, "unsyncedCount"); | 178 ExpectDictIntegerValue(kUnsyncedCount, *value, "unsyncedCount"); |
178 ExpectDictIntegerValue(kNumBlockingConflictingUpdates, *value, | 179 ExpectDictIntegerValue(kNumBlockingConflictingUpdates, *value, |
179 "numBlockingConflictingUpdates"); | 180 "numBlockingConflictingUpdates"); |
180 ExpectDictIntegerValue(kNumConflictingUpdates, *value, | 181 ExpectDictIntegerValue(kNumConflictingUpdates, *value, |
181 "numConflictingUpdates"); | 182 "numConflictingUpdates"); |
182 ExpectDictBooleanValue(kDidCommitItems, *value, | 183 ExpectDictBooleanValue(kDidCommitItems, *value, |
183 "didCommitItems"); | 184 "didCommitItems"); |
184 ExpectDictDictionaryValue(*expected_source_value, *value, "source"); | 185 ExpectDictDictionaryValue(*expected_source_value, *value, "source"); |
185 } | 186 } |
186 | 187 |
187 } // namespace | 188 } // namespace |
188 } // namespace sessions | 189 } // namespace sessions |
189 } // namespace browser_sync | 190 } // namespace browser_sync |
OLD | NEW |