Implement new SyncAPI and convert Preferences to it.

chrome/browser/sync/glue/generic_change_processor.cc

Index: chrome/browser/sync/glue/generic_change_processor.cc
diff --git a/chrome/browser/sync/glue/generic_change_processor.cc b/chrome/browser/sync/glue/generic_change_processor.cc
index dabf0317ad4636dac0a3a5b8dd12843d8df34815..c7086fb354521bcbabcce25c754e3e4eeecca313 100644
--- a/chrome/browser/sync/glue/generic_change_processor.cc
+++ b/chrome/browser/sync/glue/generic_change_processor.cc
@@ -4,18 +4,23 @@
 
 #include "chrome/browser/sync/glue/generic_change_processor.h"
 
-#include "chrome/browser/sync/glue/model_associator.h"
-#include "chrome/browser/sync/syncable_service.h"
+#include "chrome/browser/sync/api/syncable_service.h"
+#include "chrome/browser/sync/api/sync_event.h"
+#include "chrome/browser/sync/engine/syncapi.h"
+#include "chrome/browser/sync/syncable/nigori_util.h"
 
 namespace browser_sync {
 
 GenericChangeProcessor::GenericChangeProcessor(
     SyncableService* local_service,
-    UnrecoverableErrorHandler* error_handler)
+    UnrecoverableErrorHandler* error_handler,
+    sync_api::UserShare* user_share)
     : ChangeProcessor(error_handler),
-      local_service_(local_service) {
+      local_service_(local_service),
+      user_share_(user_share) {
   DCHECK(local_service_);
 }
+
 GenericChangeProcessor::~GenericChangeProcessor() {
   // Set to null to ensure it's not used after destruction.
   local_service_ = NULL;
@@ -25,11 +30,167 @@ void GenericChangeProcessor::ApplyChangesFromSyncModel(
     const sync_api::BaseTransaction* trans,
     const sync_api::SyncManager::ChangeRecord* changes,
     int change_count) {
-  local_service_->ApplyChangesFromSync(trans, changes, change_count);
+  DCHECK(running());
+  SyncEventList list_of_changes;
+  for (int i = 0; i < change_count; ++i) {
+    SyncEvent::SyncEventType action;
+    sync_pb::EntitySpecifics const* specifics = NULL;
+    if (sync_api::SyncManager::ChangeRecord::ACTION_DELETE ==
+        changes[i].action) {
+      action = SyncEvent::ACTION_DELETE;
+      specifics = &changes[i].specifics;
+      DCHECK(specifics);
+    } else if (sync_api::SyncManager::ChangeRecord::ACTION_ADD ==
+               changes[i].action) {
+      action = SyncEvent::ACTION_ADD;
+    } else {  // ACTION_UPDATE.
+      action = SyncEvent::ACTION_UPDATE;
+    }
+    if (!specifics) {
+      // Need to load from node.
+      sync_api::ReadNode read_node(trans);
+      if (!read_node.InitByIdLookup(changes[i].id)) {
+        error_handler()->OnUnrecoverableError(FROM_HERE, "Failed to look up "
+            " data for received change with id " + changes[i].id);
+        return;
+      }
+      specifics = &read_node.GetEntitySpecifics();
+    }
+    DCHECK_NE(syncable::UNSPECIFIED,
+              syncable::GetModelTypeFromSpecifics(*specifics));
+    list_of_changes.push_back(
+        SyncEvent(action, SyncData::CreateRemoteData(*specifics)));
+  }
+  local_service_->ProcessSyncEvents(list_of_changes);
+}
+
+bool GenericChangeProcessor::GetSyncDataForType(
+    syncable::ModelType type,
+    SyncDataList* current_sync_data) {
+  std::string type_name = syncable::ModelTypeToString(type);
+  sync_api::ReadTransaction trans(share_handle());
+  sync_api::ReadNode root(&trans);
+  if (!root.InitByTagLookup(syncable::ModelTypeToRootTag(type))) {
+    LOG(ERROR) << "Server did not create the top-level " + type_name + " node."
+               << " We might be running against an out-of-date server.";
+    return false;
+  }
+
+  int64 sync_child_id = root.GetFirstChildId();
+  while (sync_child_id != sync_api::kInvalidId) {
+    sync_api::ReadNode sync_child_node(&trans);
+    if (!sync_child_node.InitByIdLookup(sync_child_id)) {
+      LOG(ERROR) << "Failed to fetch child node for type " + type_name + ".";
+      return false;
+    }
+    current_sync_data->push_back(SyncData::CreateRemoteData(
+        sync_child_node.GetEntitySpecifics()));
+    sync_child_id = sync_child_node.GetSuccessorId();
+  }
+  return true;
+}
+
+void GenericChangeProcessor::ProcessSyncEvents(
+    const SyncEventList& list_of_changes) {
+  sync_api::WriteTransaction trans(share_handle());
+
+  SyncEventList::const_iterator event_iterator;

[akalin, 2011/05/19 00:58:45]

usual style is to just use 'it' for iterators, right?

[Nicolas Zea, 2011/05/19 21:17:45]

I think "iter" is more common, but there's no real guideline. Went ahead and
changed to that though.

+  for (event_iterator = list_of_changes.begin();
+       event_iterator != list_of_changes.end();
+       ++event_iterator) {
+    const SyncEvent& event = *event_iterator;
+    DCHECK_NE(event.sync_data().GetDataType(), syncable::UNSPECIFIED);
+    std::string type_str = syncable::ModelTypeToString(
+        event.sync_data().GetDataType());
+    sync_api::WriteNode sync_node(&trans);
+    if (event.event_type() == SyncEvent::ACTION_DELETE) {
+      if (event.sync_data().GetTag() == "" ||
+          !sync_node.InitByClientTagLookup(event.sync_data().GetDataType(),
+                                           event.sync_data().GetTag())) {
+        NOTREACHED();

[akalin, 2011/05/19 00:58:45]

I feel like this is a recoverable error -- maybe we should just 'continue' in
this case?

[Nicolas Zea, 2011/05/19 21:17:45]

This is how change processors normally handle failures, and for now it's better
to be consistent I think. If we're not managing to lookup tags, then something
is very wrong. And if we're receiving the wrong tags, things are likely wrong
too, and we don't want to risk propagating that to other clients.

In addition, if the client is misbehaving, we should disable. Currently this
will disable sync, but eventually I think we want to be able to support datatype
specific unrecoverable errors, in which case this would be the correct approach.
Considering this isn't an expected code path and that NOTREACHED is in there, I
prefer this route.

+        error_handler()->OnUnrecoverableError(FROM_HERE,
+            "Failed to delete " + type_str + " node.");
+        return;
+      }
+      sync_node.Remove();
+    } else if (event.event_type() == SyncEvent::ACTION_ADD) {
+      // TODO(sync): Handle other types of creation (custom parents, folders,
+      // etc.).
+      sync_api::ReadNode root_node(&trans);
+      if (!root_node.InitByTagLookup(
+              syncable::ModelTypeToRootTag(event.sync_data().GetDataType()))) {
+        NOTREACHED();
+        error_handler()->OnUnrecoverableError(FROM_HERE,
+            "Failed to look up root node for type " + type_str);
+        return;
+      }
+      if (!sync_node.InitUniqueByCreation(event.sync_data().GetDataType(),
+                                          root_node,
+                                          event.sync_data().GetTag())) {
+        error_handler()->OnUnrecoverableError(FROM_HERE,
+            "Failed to create " + type_str + " node.");
+        return;
+      }
+      sync_node.SetEntitySpecifics(event.sync_data().GetSpecifics());
+    } else if (event.event_type() == SyncEvent::ACTION_UPDATE) {
+      if (event.sync_data().GetTag() == "" ||

[akalin, 2011/05/19 00:58:45]

i think the empty tag case is a recoverable error

[Nicolas Zea, 2011/05/19 21:17:45]

See previous comment.

+          !sync_node.InitByClientTagLookup(event.sync_data().GetDataType(),
+                                           event.sync_data().GetTag())) {
+        NOTREACHED();
+        error_handler()->OnUnrecoverableError(FROM_HERE,
+            "Failed to update " + type_str + " node");
+        return;
+      }
+      sync_node.SetEntitySpecifics(event.sync_data().GetSpecifics());
+      // TODO(sync): Support updating other parts of the sync node (title,
+      // successor, parent, etc.).
+    } else {
+      NOTREACHED();
+      error_handler()->OnUnrecoverableError(FROM_HERE,

[akalin, 2011/05/19 00:58:45]

I think we can be resilient to bad clients and just drop invalid changes (with
NOTREACHED())

[Nicolas Zea, 2011/05/19 21:17:45]

See previous comment.

+          "Received unset SyncEvent in the change processor.");
+      return;
+    }
+  }
+}
+
+bool GenericChangeProcessor::SyncModelHasUserCreatedNodes(
+    syncable::ModelType type,
+    bool* has_nodes) {
+  DCHECK(has_nodes);
+  DCHECK_NE(type, syncable::UNSPECIFIED);
+  std::string type_name = syncable::ModelTypeToString(type);
+  std::string err_str = "Server did not create the top-level " + type_name +
+      " node. We might be running against an out-of-date server.";
+  *has_nodes = false;
+  sync_api::ReadTransaction trans(share_handle());
+  sync_api::ReadNode type_root_node(&trans);
+  if (!type_root_node.InitByTagLookup(syncable::ModelTypeToRootTag(type))) {
+    LOG(ERROR) << err_str;
+    return false;
+  }
+
+  // The sync model has user created nodes if the type's root node has any
+  // children.
+  *has_nodes = sync_api::kInvalidId != type_root_node.GetFirstChildId();
+  return true;
+}
+
+bool GenericChangeProcessor::CryptoReadyIfNecessary(syncable::ModelType type) {
+  DCHECK_NE(type, syncable::UNSPECIFIED);
+  // We only access the cryptographer while holding a transaction.
+  sync_api::ReadTransaction trans(share_handle());
+  const syncable::ModelTypeSet& encrypted_types =
+      syncable::GetEncryptedDataTypes(trans.GetWrappedTrans());
+  return encrypted_types.count(type) == 0 ||
+         trans.GetCryptographer()->is_ready();
 }
 
 void GenericChangeProcessor::StartImpl(Profile* profile) {}
 
 void GenericChangeProcessor::StopImpl() {}
 
+sync_api::UserShare* GenericChangeProcessor::share_handle() {
+  return user_share_;
+}
+
 }  // namespace browser_sync