summaryrefslogtreecommitdiffstats
path: root/sync/engine/commit.cc
diff options
context:
space:
mode:
authormaniscalco@chromium.org <maniscalco@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-23 01:47:15 +0000
committermaniscalco@chromium.org <maniscalco@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-23 01:47:15 +0000
commita75d421d3c4fcb0a442a81321a26d4981e4f5bd5 (patch)
treeb92a45b0640f6d7d4b4eb49ec923c7cef08b480c /sync/engine/commit.cc
parente9ca6dc57ae757dcc2ad07354e25a96e752021a5 (diff)
downloadchromium_src-a75d421d3c4fcb0a442a81321a26d4981e4f5bd5.zip
chromium_src-a75d421d3c4fcb0a442a81321a26d4981e4f5bd5.tar.gz
chromium_src-a75d421d3c4fcb0a442a81321a26d4981e4f5bd5.tar.bz2
Send debug event info on Commit requests, not just GetUpdates requests.
BUG=318439 Review URL: https://codereview.chromium.org/82303002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@236914 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sync/engine/commit.cc')
-rw-r--r--sync/engine/commit.cc11
1 files changed, 11 insertions, 0 deletions
diff --git a/sync/engine/commit.cc b/sync/engine/commit.cc
index c7af449..a8db1a4 100644
--- a/sync/engine/commit.cc
+++ b/sync/engine/commit.cc
@@ -110,6 +110,11 @@ SyncerError Commit::PostAndProcessResponse(
}
session->mutable_status_controller()->set_commit_request_types(request_types);
+ if (session->context()->debug_info_getter()) {
+ sync_pb::DebugInfo* debug_info = message_.mutable_debug_info();
+ session->context()->debug_info_getter()->GetDebugInfo(debug_info);
+ }
+
DVLOG(1) << "Sending commit message.";
TRACE_EVENT_BEGIN0("sync", "PostCommit");
const SyncerError post_result = SyncerProtoUtil::PostClientToServerMessage(
@@ -136,6 +141,12 @@ SyncerError Commit::PostAndProcessResponse(
return SERVER_RESPONSE_VALIDATION_FAILED;
}
+ if (session->context()->debug_info_getter()) {
+ // Clear debug info now that we have successfully sent it to the server.
+ DVLOG(1) << "Clearing client debug info.";
+ session->context()->debug_info_getter()->ClearDebugInfo();
+ }
+
// Let the contributors process the responses to each of their requests.
SyncerError processing_result = SYNCER_OK;
for (std::map<ModelType, SyncDirectoryCommitContribution*>::iterator it =