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

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

Issue 19309002: sync: Add pre-commit update avoidance mode + flag (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix nits Created 7 years, 5 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/testserver/chromiumsync.py » ('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 118 matching lines...) Expand 10 before | Expand all | Expand 10 after
129 } 129 }
130 130
131 void ResetContext() { 131 void ResetContext() {
132 context_.reset(new sessions::SyncSessionContext( 132 context_.reset(new sessions::SyncSessionContext(
133 mock_server_.get(), directory(), 133 mock_server_.get(), directory(),
134 GetWorkers(), &extensions_activity_monitor_, 134 GetWorkers(), &extensions_activity_monitor_,
135 std::vector<SyncEngineEventListener*>(), 135 std::vector<SyncEngineEventListener*>(),
136 &mock_debug_info_getter_, 136 &mock_debug_info_getter_,
137 &traffic_recorder_, 137 &traffic_recorder_,
138 true, // enable keystore encryption 138 true, // enable keystore encryption
139 false, // force enable pre-commit GU avoidance experiment
139 "fake_invalidator_client_id")); 140 "fake_invalidator_client_id"));
140 context_->set_routing_info(routing_info_); 141 context_->set_routing_info(routing_info_);
141 context_->set_account_name(directory()->name()); 142 context_->set_account_name(directory()->name());
142 ClearSession(); 143 ClearSession();
143 } 144 }
144 145
145 // Install a MockServerConnection. Resets the context. By default, 146 // Install a MockServerConnection. Resets the context. By default,
146 // the context does not have a MockServerConnection attached. 147 // the context does not have a MockServerConnection attached.
147 void ConfigureMockServerConnection() { 148 void ConfigureMockServerConnection() {
148 mock_server_.reset(new MockConnectionManager(directory())); 149 mock_server_.reset(new MockConnectionManager(directory()));
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
220 virtual void TearDown() OVERRIDE; 221 virtual void TearDown() OVERRIDE;
221 virtual syncable::Directory* directory() OVERRIDE; 222 virtual syncable::Directory* directory() OVERRIDE;
222 223
223 private: 224 private:
224 TestDirectorySetterUpper dir_maker_; 225 TestDirectorySetterUpper dir_maker_;
225 }; 226 };
226 227
227 } // namespace syncer 228 } // namespace syncer
228 229
229 #endif // SYNC_TEST_ENGINE_SYNCER_COMMAND_TEST_H_ 230 #endif // SYNC_TEST_ENGINE_SYNCER_COMMAND_TEST_H_
OLDNEW
« no previous file with comments | « sync/sessions/sync_session_unittest.cc ('k') | sync/tools/testserver/chromiumsync.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698