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/js_sync_manager_observer.h" | 5 #include "chrome/browser/sync/js_sync_manager_observer.h" |
6 | 6 |
7 #include <cstddef> | 7 #include <cstddef> |
8 | 8 |
9 #include "base/basictypes.h" | 9 #include "base/basictypes.h" |
10 #include "base/tracked.h" | 10 #include "base/tracked.h" |
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
82 false, | 82 false, |
83 syncable::ModelTypeBitSet(), | 83 syncable::ModelTypeBitSet(), |
84 download_progress_markers, | 84 download_progress_markers, |
85 false, | 85 false, |
86 true, | 86 true, |
87 100, | 87 100, |
88 8, | 88 8, |
89 5, | 89 5, |
90 false, | 90 false, |
91 sessions::SyncSourceInfo(), | 91 sessions::SyncSourceInfo(), |
92 0); | 92 0, |
| 93 base::Time::Now()); |
93 DictionaryValue expected_details; | 94 DictionaryValue expected_details; |
94 expected_details.Set("snapshot", snapshot.ToValue()); | 95 expected_details.Set("snapshot", snapshot.ToValue()); |
95 | 96 |
96 EXPECT_CALL(mock_router_, | 97 EXPECT_CALL(mock_router_, |
97 RouteJsEvent("onSyncCycleCompleted", | 98 RouteJsEvent("onSyncCycleCompleted", |
98 HasDetailsAsDictionary(expected_details))); | 99 HasDetailsAsDictionary(expected_details))); |
99 | 100 |
100 sync_manager_observer_.OnSyncCycleCompleted(&snapshot); | 101 sync_manager_observer_.OnSyncCycleCompleted(&snapshot); |
101 } | 102 } |
102 | 103 |
(...skipping 198 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
301 sync_manager_observer_.OnChangesApplied(syncable::ModelTypeFromInt(i), | 302 sync_manager_observer_.OnChangesApplied(syncable::ModelTypeFromInt(i), |
302 &trans, &changes[i], | 303 &trans, &changes[i], |
303 syncable::MODEL_TYPE_COUNT - i); | 304 syncable::MODEL_TYPE_COUNT - i); |
304 } | 305 } |
305 | 306 |
306 test_user_share.TearDown(); | 307 test_user_share.TearDown(); |
307 } | 308 } |
308 | 309 |
309 } // namespace | 310 } // namespace |
310 } // namespace browser_sync | 311 } // namespace browser_sync |
OLD | NEW |