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/js_sync_manager_observer.h" | 5 #include "chrome/browser/sync/js/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/message_loop.h" | 10 #include "base/message_loop.h" |
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
99 false, | 99 false, |
100 syncable::ModelTypeBitSet(), | 100 syncable::ModelTypeBitSet(), |
101 download_progress_markers, | 101 download_progress_markers, |
102 false, | 102 false, |
103 true, | 103 true, |
104 100, | 104 100, |
105 8, | 105 8, |
106 5, | 106 5, |
107 false, | 107 false, |
108 sessions::SyncSourceInfo(), | 108 sessions::SyncSourceInfo(), |
109 0); | 109 0, |
| 110 base::Time::Now()); |
110 DictionaryValue expected_details; | 111 DictionaryValue expected_details; |
111 expected_details.Set("snapshot", snapshot.ToValue()); | 112 expected_details.Set("snapshot", snapshot.ToValue()); |
112 | 113 |
113 EXPECT_CALL(mock_js_event_handler_, | 114 EXPECT_CALL(mock_js_event_handler_, |
114 HandleJsEvent("onSyncCycleCompleted", | 115 HandleJsEvent("onSyncCycleCompleted", |
115 HasDetailsAsDictionary(expected_details))); | 116 HasDetailsAsDictionary(expected_details))); |
116 | 117 |
117 js_sync_manager_observer_.OnSyncCycleCompleted(&snapshot); | 118 js_sync_manager_observer_.OnSyncCycleCompleted(&snapshot); |
118 PumpLoop(); | 119 PumpLoop(); |
119 } | 120 } |
(...skipping 205 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
325 &trans, &changes[i], | 326 &trans, &changes[i], |
326 syncable::MODEL_TYPE_COUNT - i); | 327 syncable::MODEL_TYPE_COUNT - i); |
327 } | 328 } |
328 | 329 |
329 test_user_share.TearDown(); | 330 test_user_share.TearDown(); |
330 PumpLoop(); | 331 PumpLoop(); |
331 } | 332 } |
332 | 333 |
333 } // namespace | 334 } // namespace |
334 } // namespace browser_sync | 335 } // namespace browser_sync |
OLD | NEW |