Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(84)

Side by Side Diff: sync/test/engine/syncer_command_test.h

Issue 12092091: Separate sync and invalidation client IDs (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « sync/sessions/sync_session_unittest.cc ('k') | sync/tools/null_invalidation_state_tracker.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 true, // enable keystore encryption
132 "fake_invalidator_client_id"));
132 context_->set_account_name(directory()->name()); 133 context_->set_account_name(directory()->name());
133 ClearSession(); 134 ClearSession();
134 } 135 }
135 136
136 // Install a MockServerConnection. Resets the context. By default, 137 // Install a MockServerConnection. Resets the context. By default,
137 // the context does not have a MockServerConnection attached. 138 // the context does not have a MockServerConnection attached.
138 void ConfigureMockServerConnection() { 139 void ConfigureMockServerConnection() {
139 mock_server_.reset(new MockConnectionManager(directory())); 140 mock_server_.reset(new MockConnectionManager(directory()));
140 ResetContext(); 141 ResetContext();
141 } 142 }
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
228 229
229 virtual void SetUp() OVERRIDE; 230 virtual void SetUp() OVERRIDE;
230 231
231 TestUnrecoverableErrorHandler handler_; 232 TestUnrecoverableErrorHandler handler_;
232 syncable::MockDirectory mock_directory_; 233 syncable::MockDirectory mock_directory_;
233 }; 234 };
234 235
235 } // namespace syncer 236 } // namespace syncer
236 237
237 #endif // SYNC_TEST_ENGINE_SYNCER_COMMAND_TEST_H_ 238 #endif // SYNC_TEST_ENGINE_SYNCER_COMMAND_TEST_H_
OLDNEW
« no previous file with comments | « sync/sessions/sync_session_unittest.cc ('k') | sync/tools/null_invalidation_state_tracker.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698