Enable invalidations for arbitrary objects on Android.

chrome/browser/invalidation/invalidation_service_android.cc

 // Copyright (c) 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/invalidation/invalidation_service_android.h"
 
 #include "chrome/browser/chrome_notification_types.h"
+#include "chrome/browser/invalidation/invalidation_controller_android.h"
 #include "content/public/browser/notification_service.h"
 
 namespace invalidation {
 
-InvalidationServiceAndroid::InvalidationServiceAndroid(Profile* profile)
-    : invalidator_state_(syncer::INVALIDATIONS_ENABLED) {
+InvalidationServiceAndroid::InvalidationServiceAndroid(
+    Profile* profile,
+    InvalidationControllerAndroid* invalidation_controller)
+    : invalidator_state_(syncer::INVALIDATIONS_ENABLED),
+      invalidation_controller_(invalidation_controller) {
   DCHECK(CalledOnValidThread());
+  DCHECK(invalidation_controller);
   registrar_.Add(this, chrome::NOTIFICATION_SYNC_REFRESH_REMOTE,
                  content::Source<Profile>(profile));
 }
 
 InvalidationServiceAndroid::~InvalidationServiceAndroid() { }
 
 void InvalidationServiceAndroid::RegisterInvalidationHandler(
     syncer::InvalidationHandler* handler) {
   DCHECK(CalledOnValidThread());
   invalidator_registrar_.RegisterHandler(handler);
 }
 
 void InvalidationServiceAndroid::UpdateRegisteredInvalidationIds(
     syncer::InvalidationHandler* handler,
     const syncer::ObjectIdSet& ids) {
   DCHECK(CalledOnValidThread());
   invalidator_registrar_.UpdateRegisteredIds(handler, ids);
+  invalidation_controller_->SetRegisteredObjectIds(
+      invalidator_registrar_.GetAllRegisteredIds());
 }
 
 void InvalidationServiceAndroid::UnregisterInvalidationHandler(
     syncer::InvalidationHandler* handler) {
   DCHECK(CalledOnValidThread());
   invalidator_registrar_.UnregisterHandler(handler);
 }
 
 void InvalidationServiceAndroid::AcknowledgeInvalidation(
     const invalidation::ObjectId& id,
@@ skipping 40 matching lines @@
 }
 
 void InvalidationServiceAndroid::TriggerStateChangeForTest(
     syncer::InvalidatorState state) {
   DCHECK(CalledOnValidThread());
   invalidator_state_ = state;
   invalidator_registrar_.UpdateInvalidatorState(invalidator_state_);
 }
 
 } //  namespace invalidation