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 #ifndef SYNC_TEST_ENGINE_SYNCER_COMMAND_TEST_H_ | 5 #ifndef SYNC_TEST_ENGINE_SYNCER_COMMAND_TEST_H_ |
6 #define SYNC_TEST_ENGINE_SYNCER_COMMAND_TEST_H_ | 6 #define SYNC_TEST_ENGINE_SYNCER_COMMAND_TEST_H_ |
7 | 7 |
8 #include <algorithm> | 8 #include <algorithm> |
9 #include <string> | 9 #include <string> |
10 #include <vector> | 10 #include <vector> |
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
120 } | 120 } |
121 | 121 |
122 void ResetContext() { | 122 void ResetContext() { |
123 throttled_data_type_tracker_.reset(new ThrottledDataTypeTracker(NULL)); | 123 throttled_data_type_tracker_.reset(new ThrottledDataTypeTracker(NULL)); |
124 context_.reset(new sessions::SyncSessionContext( | 124 context_.reset(new sessions::SyncSessionContext( |
125 mock_server_.get(), directory(), | 125 mock_server_.get(), directory(), |
126 GetWorkers(), &extensions_activity_monitor_, | 126 GetWorkers(), &extensions_activity_monitor_, |
127 throttled_data_type_tracker_.get(), | 127 throttled_data_type_tracker_.get(), |
128 std::vector<SyncEngineEventListener*>(), | 128 std::vector<SyncEngineEventListener*>(), |
129 &mock_debug_info_getter_, | 129 &mock_debug_info_getter_, |
130 &traffic_recorder_)); | 130 &traffic_recorder_, |
| 131 true /* enable keystore encryption*/ )); |
131 context_->set_account_name(directory()->name()); | 132 context_->set_account_name(directory()->name()); |
132 ClearSession(); | 133 ClearSession(); |
133 } | 134 } |
134 | 135 |
135 // Install a MockServerConnection. Resets the context. By default, | 136 // Install a MockServerConnection. Resets the context. By default, |
136 // the context does not have a MockServerConnection attached. | 137 // the context does not have a MockServerConnection attached. |
137 void ConfigureMockServerConnection() { | 138 void ConfigureMockServerConnection() { |
138 mock_server_.reset(new MockConnectionManager(directory())); | 139 mock_server_.reset(new MockConnectionManager(directory())); |
139 ResetContext(); | 140 ResetContext(); |
140 } | 141 } |
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
227 | 228 |
228 virtual void SetUp() OVERRIDE; | 229 virtual void SetUp() OVERRIDE; |
229 | 230 |
230 TestUnrecoverableErrorHandler handler_; | 231 TestUnrecoverableErrorHandler handler_; |
231 syncable::MockDirectory mock_directory_; | 232 syncable::MockDirectory mock_directory_; |
232 }; | 233 }; |
233 | 234 |
234 } // namespace syncer | 235 } // namespace syncer |
235 | 236 |
236 #endif // SYNC_TEST_ENGINE_SYNCER_COMMAND_TEST_H_ | 237 #endif // SYNC_TEST_ENGINE_SYNCER_COMMAND_TEST_H_ |
OLD | NEW |