sync: Inject sync/'s dependency on invalidations

chrome/browser/sync/glue/sync_backend_host_core.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/sync/glue/sync_backend_host_core.h"
 
 #include "base/file_util.h"
 #include "base/metrics/histogram.h"
 #include "chrome/browser/sync/glue/device_info.h"
+#include "chrome/browser/sync/glue/invalidation_adapter.h"
 #include "chrome/browser/sync/glue/sync_backend_registrar.h"
 #include "chrome/browser/sync/glue/synced_device_tracker.h"
 #include "chrome/common/chrome_version_info.h"
 #include "sync/internal_api/public/events/protocol_event.h"
 #include "sync/internal_api/public/http_post_provider_factory.h"
 #include "sync/internal_api/public/internal_components_factory.h"
 #include "sync/internal_api/public/sessions/commit_counters.h"
 #include "sync/internal_api/public/sessions/status_counters.h"
 #include "sync/internal_api/public/sessions/sync_session_snapshot.h"
 #include "sync/internal_api/public/sessions/update_counters.h"
 #include "sync/internal_api/public/sync_core_proxy.h"
 #include "sync/internal_api/public/sync_manager.h"
 #include "sync/internal_api/public/sync_manager_factory.h"
+#include "sync/notifier/invalidation_util.h"
+#include "sync/notifier/object_id_invalidation_map.h"
 
 // Helper macros to log with the syncer thread name; useful when there
 // are multiple syncers involved.
 
 #define SLOG(severity) LOG(severity) << name_ << ": "
 
 #define SDVLOG(verbose_level) DVLOG(verbose_level) << name_ << ": "
 
 static const int kSaveChangesIntervalSeconds = 10;
 
@@ skipping 329 matching lines @@
 
 void SyncBackendHostCore::DoOnInvalidatorStateChange(
     syncer::InvalidatorState state) {
   DCHECK_EQ(base::MessageLoop::current(), sync_loop_);
   sync_manager_->OnInvalidatorStateChange(state);
 }
 
 void SyncBackendHostCore::DoOnIncomingInvalidation(
     const syncer::ObjectIdInvalidationMap& invalidation_map) {
   DCHECK_EQ(base::MessageLoop::current(), sync_loop_);
-  sync_manager_->OnIncomingInvalidation(invalidation_map);
+
+  syncer::ObjectIdSet ids = invalidation_map.GetObjectIds();
+  for (syncer::ObjectIdSet::const_iterator ids_it = ids.begin();
+       ids_it != ids.end();
+       ++ids_it) {
+    syncer::ModelType type;
+    if (!NotificationTypeToRealModelType(ids_it->name(), &type)) {
+      DLOG(WARNING) << "Notification has invalid id: "
+                    << syncer::ObjectIdToString(*ids_it);
+    } else {

[tim (not reviewing), 2014/06/20 20:47:54]

This may end up being a little less efficient since we're nesting loops, but I
doubt we're ever talking about large lists of invalidations here or in the
DataTypeTracker.  And otherwise I don't see any problems with the approach, I
like that the OnIncomingInvalidation API and implementation is simpler.

Still LGTM

+      syncer::SingleObjectInvalidationSet invalidation_set =
+          invalidation_map.ForObject(*ids_it);
+      for (syncer::SingleObjectInvalidationSet::const_iterator inv_it =
+               invalidation_set.begin();
+           inv_it != invalidation_set.end();
+           ++inv_it) {
+        scoped_ptr<syncer::InvalidationInterface> inv_adapter(
+            new InvalidationAdapter(*inv_it));
+        sync_manager_->OnIncomingInvalidation(type, inv_adapter.Pass());
+      }
+    }
+  }
 }
 
 void SyncBackendHostCore::DoInitialize(
     scoped_ptr<DoInitializeOptions> options) {
   DCHECK(!sync_loop_);
   sync_loop_ = options->sync_loop;
   DCHECK(sync_loop_);
 
   // Finish initializing the HttpBridgeFactory.  We do this here because
   // building the user agent may block on some platforms.
@@ skipping 335 matching lines @@
       this, &SyncBackendHostCore::SaveChanges);
 }
 
 void SyncBackendHostCore::SaveChanges() {
   DCHECK_EQ(base::MessageLoop::current(), sync_loop_);
   sync_manager_->SaveChanges();
 }
 
 }  // namespace browser_sync