| 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 "sync/engine/syncer.h" | 5 #include "sync/engine/syncer.h" |
| 6 | 6 |
| 7 #include <memory> | 7 #include <memory> |
| 8 | 8 |
| 9 #include "base/auto_reset.h" | 9 #include "base/auto_reset.h" |
| 10 #include "base/location.h" | 10 #include "base/location.h" |
| (...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 172 } | 172 } |
| 173 | 173 |
| 174 SyncerError Syncer::BuildAndPostCommits(ModelTypeSet requested_types, | 174 SyncerError Syncer::BuildAndPostCommits(ModelTypeSet requested_types, |
| 175 sessions::NudgeTracker* nudge_tracker, | 175 sessions::NudgeTracker* nudge_tracker, |
| 176 sessions::SyncSession* session, | 176 sessions::SyncSession* session, |
| 177 CommitProcessor* commit_processor) { | 177 CommitProcessor* commit_processor) { |
| 178 // The ExitRequested() check is unnecessary, since we should start getting | 178 // The ExitRequested() check is unnecessary, since we should start getting |
| 179 // errors from the ServerConnectionManager if an exist has been requested. | 179 // errors from the ServerConnectionManager if an exist has been requested. |
| 180 // However, it doesn't hurt to check it anyway. | 180 // However, it doesn't hurt to check it anyway. |
| 181 while (!ExitRequested()) { | 181 while (!ExitRequested()) { |
| 182 std::unique_ptr<Commit> commit(Commit::Init( | 182 std::unique_ptr<Commit> commit( |
| 183 requested_types, session->context()->GetEnabledTypes(), | 183 Commit::Init(requested_types, session->context()->GetEnabledTypes(), |
| 184 session->context()->max_commit_batch_size(), | 184 session->context()->max_commit_batch_size(), |
| 185 session->context()->account_name(), | 185 session->context()->account_name(), |
| 186 session->context()->directory()->cache_guid(), | 186 session->context()->directory()->cache_guid(), |
| 187 session->context()->cookie_jar_mismatch(), commit_processor, | 187 session->context()->cookie_jar_mismatch(), |
| 188 session->context()->extensions_activity())); | 188 session->context()->cookie_jar_empty(), commit_processor, |
| 189 session->context()->extensions_activity())); |
| 189 if (!commit) { | 190 if (!commit) { |
| 190 break; | 191 break; |
| 191 } | 192 } |
| 192 | 193 |
| 193 SyncerError error = commit->PostAndProcessResponse( | 194 SyncerError error = commit->PostAndProcessResponse( |
| 194 nudge_tracker, session, session->mutable_status_controller(), | 195 nudge_tracker, session, session->mutable_status_controller(), |
| 195 session->context()->extensions_activity()); | 196 session->context()->extensions_activity()); |
| 196 commit->CleanUp(); | 197 commit->CleanUp(); |
| 197 if (error != SYNCER_OK) { | 198 if (error != SYNCER_OK) { |
| 198 return error; | 199 return error; |
| (...skipping 25 matching lines...) Expand all Loading... |
| 224 } | 225 } |
| 225 | 226 |
| 226 bool Syncer::PostClearServerData(SyncSession* session) { | 227 bool Syncer::PostClearServerData(SyncSession* session) { |
| 227 DCHECK(session); | 228 DCHECK(session); |
| 228 ClearServerData clear_server_data(session->context()->account_name()); | 229 ClearServerData clear_server_data(session->context()->account_name()); |
| 229 const SyncerError post_result = clear_server_data.SendRequest(session); | 230 const SyncerError post_result = clear_server_data.SendRequest(session); |
| 230 return post_result == SYNCER_OK; | 231 return post_result == SYNCER_OK; |
| 231 } | 232 } |
| 232 | 233 |
| 233 } // namespace syncer | 234 } // namespace syncer |
| OLD | NEW |