Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / sync / engine / non_blocking_type_processor_core.cc

diff --git a/src/sync/engine/non_blocking_type_processor_core.cc b/src/sync/engine/non_blocking_type_processor_core.cc
index fdb9e10..ea0f918 100644 (file)
--- a/src/sync/engine/non_blocking_type_processor_core.cc
+++ b/src/sync/engine/non_blocking_type_processor_core.cc
@@ -33,25 +33,34 @@ void NonBlockingTypeProcessorCore::GetDownloadProgress(
     sync_pb::DataTypeProgressMarker* progress_marker) const {
   DCHECK(CalledOnValidThread());
   // TODO(rlarocque): Implement this properly.  crbug.com/351005.
-  VLOG(1) << "Getting progress for: " << ModelTypeToString(type_);
+  DVLOG(1) << "Getting progress for: " << ModelTypeToString(type_);
   *progress_marker = progress_marker_;
 }
 
-void NonBlockingTypeProcessorCore::ProcessGetUpdatesResponse(
+void NonBlockingTypeProcessorCore::GetDataTypeContext(
+    sync_pb::DataTypeContext* context) const {
+  // TODO(rlarocque): Implement this properly.  crbug.com/351005.
+  DVLOG(1) << "Getting context for: " << ModelTypeToString(type_);
+  context->Clear();
+}
+
+SyncerError NonBlockingTypeProcessorCore::ProcessGetUpdatesResponse(
     const sync_pb::DataTypeProgressMarker& progress_marker,
+    const sync_pb::DataTypeContext& mutated_context,
     const SyncEntityList& applicable_updates,
     sessions::StatusController* status) {
   DCHECK(CalledOnValidThread());
   // TODO(rlarocque): Implement this properly.  crbug.com/351005.
-  VLOG(1) << "Processing updates response for: " << ModelTypeToString(type_);
+  DVLOG(1) << "Processing updates response for: " << ModelTypeToString(type_);
   progress_marker_ = progress_marker;
+  return SYNCER_OK;
 }
 
 void NonBlockingTypeProcessorCore::ApplyUpdates(
     sessions::StatusController* status) {
   DCHECK(CalledOnValidThread());
   // TODO(rlarocque): Implement this properly.  crbug.com/351005.
-  VLOG(1) << "Applying updates for: " << ModelTypeToString(type_);
+  DVLOG(1) << "Applying updates for: " << ModelTypeToString(type_);
 }
 
 void NonBlockingTypeProcessorCore::PassiveApplyUpdates(
@@ -66,7 +75,7 @@ scoped_ptr<CommitContribution>
 NonBlockingTypeProcessorCore::GetContribution(size_t max_entries) {
   DCHECK(CalledOnValidThread());
   // TODO(rlarocque): Implement this properly.  crbug.com/351005.
-  VLOG(1) << "Getting commit contribution for: " << ModelTypeToString(type_);
+  DVLOG(1) << "Getting commit contribution for: " << ModelTypeToString(type_);
   return scoped_ptr<CommitContribution>();
 }