| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "base/bind.h" | 5 #include "base/bind.h" |
| 6 #include "base/callback.h" | 6 #include "base/callback.h" |
| 7 #include "base/compiler_specific.h" | 7 #include "base/compiler_specific.h" |
| 8 #include "base/memory/weak_ptr.h" | 8 #include "base/memory/weak_ptr.h" |
| 9 #include "base/message_loop.h" | 9 #include "base/message_loop.h" |
| 10 #include "base/test/test_timeouts.h" | 10 #include "base/test/test_timeouts.h" |
| (...skipping 12 matching lines...) Expand all Loading... |
| 23 using base::TimeTicks; | 23 using base::TimeTicks; |
| 24 using testing::_; | 24 using testing::_; |
| 25 using testing::AtLeast; | 25 using testing::AtLeast; |
| 26 using testing::DoAll; | 26 using testing::DoAll; |
| 27 using testing::Eq; | 27 using testing::Eq; |
| 28 using testing::Invoke; | 28 using testing::Invoke; |
| 29 using testing::Mock; | 29 using testing::Mock; |
| 30 using testing::Return; | 30 using testing::Return; |
| 31 using testing::WithArg; | 31 using testing::WithArg; |
| 32 | 32 |
| 33 namespace csync { | 33 namespace syncer { |
| 34 using sessions::SyncSession; | 34 using sessions::SyncSession; |
| 35 using sessions::SyncSessionContext; | 35 using sessions::SyncSessionContext; |
| 36 using sessions::SyncSessionSnapshot; | 36 using sessions::SyncSessionSnapshot; |
| 37 using syncable::ModelTypeSet; | 37 using syncable::ModelTypeSet; |
| 38 using sync_pb::GetUpdatesCallerInfo; | 38 using sync_pb::GetUpdatesCallerInfo; |
| 39 | 39 |
| 40 class MockSyncer : public Syncer { | 40 class MockSyncer : public Syncer { |
| 41 public: | 41 public: |
| 42 MOCK_METHOD3(SyncShare, void(sessions::SyncSession*, SyncerStep, | 42 MOCK_METHOD3(SyncShare, void(sessions::SyncSession*, SyncerStep, |
| 43 SyncerStep)); | 43 SyncerStep)); |
| (...skipping 1089 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1133 zero(), NUDGE_SOURCE_LOCAL, ModelTypeSet(), FROM_HERE); | 1133 zero(), NUDGE_SOURCE_LOCAL, ModelTypeSet(), FROM_HERE); |
| 1134 PumpLoop(); | 1134 PumpLoop(); |
| 1135 // Pump again to run job. | 1135 // Pump again to run job. |
| 1136 PumpLoop(); | 1136 PumpLoop(); |
| 1137 | 1137 |
| 1138 StopSyncScheduler(); | 1138 StopSyncScheduler(); |
| 1139 | 1139 |
| 1140 EXPECT_TRUE(expected == context()->previous_session_routing_info()); | 1140 EXPECT_TRUE(expected == context()->previous_session_routing_info()); |
| 1141 } | 1141 } |
| 1142 | 1142 |
| 1143 } // namespace csync | 1143 } // namespace syncer |
| OLD | NEW |