[Android] Only invalidate objects that were received from Tango on resume.

components/invalidation/invalidation_service_android.h

 // 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.
 
 #ifndef COMPONENTS_INVALIDATION_INVALIDATION_SERVICE_ANDROID_H_
 #define COMPONENTS_INVALIDATION_INVALIDATION_SERVICE_ANDROID_H_
 
 #include <jni.h>
 #include <map>
 
@@ skipping 32 matching lines @@
                                        const syncer::ObjectIdSet& ids) override;
   void UnregisterInvalidationHandler(
       syncer::InvalidationHandler* handler) override;
   syncer::InvalidatorState GetInvalidatorState() const override;
   std::string GetInvalidatorClientId() const override;
   InvalidationLogger* GetInvalidationLogger() override;
   void RequestDetailedStatus(
       base::Callback<void(const base::DictionaryValue&)> caller) const override;
   IdentityProvider* GetIdentityProvider() override;
 
-  void RequestSync(JNIEnv* env,
-                   jobject obj,
-                   jint object_source,
-                   jstring object_id,
-                   jlong version,
-                   jstring state);
-
-  void RequestSyncForAllTypes(JNIEnv* env, jobject obj);
+  void Invalidate(JNIEnv* env,
+                  jobject obj,
+                  jint object_source,
+                  jstring object_id,
+                  jlong version,
+                  jstring state);
 
   // The InvalidationServiceAndroid always reports that it is enabled.
   // This is used only by unit tests.
   void TriggerStateChangeForTest(syncer::InvalidatorState state);
 
   static bool RegisterJni(JNIEnv* env);
 
  private:
   typedef std::map<invalidation::ObjectId,
                    int64,
@@ skipping 11 matching lines @@
 
   // The invalidation API spec allows for the possibility of redundant
   // invalidations, so keep track of the max versions and drop
   // invalidations with old versions.
   ObjectIdVersionMap max_invalidation_versions_;
 
   // The invalidation logger object we use to record state changes
   // and invalidations.
   InvalidationLogger logger_;
 
-  void DispatchInvalidations(
-      syncer::ObjectIdInvalidationMap& object_invalidation_map);
-
   DISALLOW_COPY_AND_ASSIGN(InvalidationServiceAndroid);
 };
 
 }  // namespace invalidation
 
 #endif  // COMPONENTS_INVALIDATION_INVALIDATION_SERVICE_ANDROID_H_