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 92 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
103 syncable::ModelTypeBitSet(), | 103 syncable::ModelTypeBitSet(), |
104 download_progress_markers, | 104 download_progress_markers, |
105 false, | 105 false, |
106 true, | 106 true, |
107 100, | 107 100, |
108 8, | 108 8, |
109 5, | 109 5, |
110 false, | 110 false, |
111 sessions::SyncSourceInfo(), | 111 sessions::SyncSourceInfo(), |
112 0, | 112 0, |
113 base::Time::Now()); | 113 base::Time::Now(), |
| 114 browser_sync::sessions::SyncError()); |
114 DictionaryValue expected_details; | 115 DictionaryValue expected_details; |
115 expected_details.Set("snapshot", snapshot.ToValue()); | 116 expected_details.Set("snapshot", snapshot.ToValue()); |
116 | 117 |
117 EXPECT_CALL(mock_js_event_handler_, | 118 EXPECT_CALL(mock_js_event_handler_, |
118 HandleJsEvent("onSyncCycleCompleted", | 119 HandleJsEvent("onSyncCycleCompleted", |
119 HasDetailsAsDictionary(expected_details))); | 120 HasDetailsAsDictionary(expected_details))); |
120 | 121 |
121 js_sync_manager_observer_.OnSyncCycleCompleted(&snapshot); | 122 js_sync_manager_observer_.OnSyncCycleCompleted(&snapshot); |
122 PumpLoop(); | 123 PumpLoop(); |
123 } | 124 } |
(...skipping 205 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
329 &trans, &changes[i], | 330 &trans, &changes[i], |
330 syncable::MODEL_TYPE_COUNT - i); | 331 syncable::MODEL_TYPE_COUNT - i); |
331 } | 332 } |
332 | 333 |
333 test_user_share.TearDown(); | 334 test_user_share.TearDown(); |
334 PumpLoop(); | 335 PumpLoop(); |
335 } | 336 } |
336 | 337 |
337 } // namespace | 338 } // namespace |
338 } // namespace browser_sync | 339 } // namespace browser_sync |
OLD | NEW |