OLD | NEW |
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2009 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 <list> | 5 #include <list> |
6 #include <map> | 6 #include <map> |
7 | 7 |
8 #include "base/scoped_ptr.h" | 8 #include "base/scoped_ptr.h" |
9 #include "base/synchronization/lock.h" | 9 #include "base/synchronization/lock.h" |
10 #include "base/time.h" | 10 #include "base/time.h" |
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
51 syncable::ModelType type(syncable::ModelTypeFromInt(i)); | 51 syncable::ModelType type(syncable::ModelTypeFromInt(i)); |
52 sync_pb::DataTypeProgressMarker token; | 52 sync_pb::DataTypeProgressMarker token; |
53 token.set_data_type_id( | 53 token.set_data_type_id( |
54 syncable::GetExtensionFieldNumberFromModelType(type)); | 54 syncable::GetExtensionFieldNumberFromModelType(type)); |
55 token.set_token("foobar"); | 55 token.set_token("foobar"); |
56 token.SerializeToString(&download_progress_markers[i]); | 56 token.SerializeToString(&download_progress_markers[i]); |
57 } | 57 } |
58 return SyncSessionSnapshot(SyncerStatus(), ErrorCounters(), | 58 return SyncSessionSnapshot(SyncerStatus(), ErrorCounters(), |
59 num_server_changes_remaining, false, | 59 num_server_changes_remaining, false, |
60 syncable::ModelTypeBitSet(), download_progress_markers, | 60 syncable::ModelTypeBitSet(), download_progress_markers, |
61 false, false, unsynced_count, 0, false); | 61 false, false, unsynced_count, 0, false, sessions::SyncSourceInfo()); |
62 } | 62 } |
63 | 63 |
64 class ListenerMock : public SyncEngineEventListener { | 64 class ListenerMock : public SyncEngineEventListener { |
65 public: | 65 public: |
66 MOCK_METHOD1(OnSyncEngineEvent, void(const SyncEngineEvent&)); | 66 MOCK_METHOD1(OnSyncEngineEvent, void(const SyncEngineEvent&)); |
67 }; | 67 }; |
68 | 68 |
69 class SyncerThreadWithSyncerTest : public testing::Test, | 69 class SyncerThreadWithSyncerTest : public testing::Test, |
70 public ModelSafeWorkerRegistrar, | 70 public ModelSafeWorkerRegistrar, |
71 public SyncEngineEventListener { | 71 public SyncEngineEventListener { |
(...skipping 1054 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1126 EXPECT_CALL(listener, OnSyncEngineEvent( | 1126 EXPECT_CALL(listener, OnSyncEngineEvent( |
1127 Field(&SyncEngineEvent::what_happened, | 1127 Field(&SyncEngineEvent::what_happened, |
1128 SyncEngineEvent::SYNCER_THREAD_EXITING))); | 1128 SyncEngineEvent::SYNCER_THREAD_EXITING))); |
1129 | 1129 |
1130 ASSERT_TRUE(Resume(&listener)); | 1130 ASSERT_TRUE(Resume(&listener)); |
1131 ASSERT_TRUE(sync_cycle_ended_event.TimedWait(max_wait_time_)); | 1131 ASSERT_TRUE(sync_cycle_ended_event.TimedWait(max_wait_time_)); |
1132 EXPECT_TRUE(syncer_thread()->Stop(2000)); | 1132 EXPECT_TRUE(syncer_thread()->Stop(2000)); |
1133 } | 1133 } |
1134 | 1134 |
1135 } // namespace browser_sync | 1135 } // namespace browser_sync |
OLD | NEW |