Implement features needed for local ack handling in InvalidationStateTracker.

sync/tools/sync_listen_notifications.cc

 // Copyright (c) 2012 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 <cstddef>
 #include <cstdio>
 #include <string>
 
 #include "base/at_exit.h"
 #include "base/base64.h"
+#include "base/bind.h"
+#include "base/callback.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
+#include "base/location.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop.h"
 #include "base/threading/thread.h"
 #include "jingle/notifier/base/notification_method.h"
 #include "jingle/notifier/base/notifier_options.h"
 #include "net/base/host_port_pair.h"
 #include "net/base/host_resolver.h"
@@ skipping 59 matching lines @@
     : public base::SupportsWeakPtr<NullInvalidationStateTracker>,
       public InvalidationStateTracker {
  public:
   NullInvalidationStateTracker() {}
   virtual ~NullInvalidationStateTracker() {}
 
   virtual InvalidationStateMap GetAllInvalidationStates() const OVERRIDE {
     return InvalidationStateMap();
   }
 
-  virtual void SetMaxVersion(
+  virtual void SetMaxVersionAndPayload(
       const invalidation::ObjectId& id,
-      int64 max_invalidation_version) OVERRIDE {
+      int64 max_invalidation_version,
+      const std::string& payload) OVERRIDE {
     LOG(INFO) << "Setting max invalidation version for "
-              << ObjectIdToString(id) << " to " << max_invalidation_version;
+              << ObjectIdToString(id) << " to " << max_invalidation_version
+              << " with payload " << payload;
   }
 
   virtual void Forget(const ObjectIdSet& ids) OVERRIDE {
     for (ObjectIdSet::const_iterator it = ids.begin(); it != ids.end(); ++it) {
       LOG(INFO) << "Forgetting saved state for " << ObjectIdToString(*it);
     }
   }
 
   virtual std::string GetBootstrapData() const OVERRIDE {
     return std::string();
   }
 
   virtual void SetBootstrapData(const std::string& data) OVERRIDE {
     std::string base64_data;
     CHECK(base::Base64Encode(data, &base64_data));
     LOG(INFO) << "Setting bootstrap data to: " << base64_data;

[akalin, 2012/11/28 00:11:42]

boo, duplicated code.  can you pull this out into its own file while you're in
here?

[dcheng, 2012/11/30 01:42:54]

Done.
There's some TODOs with your name attached for refactoring (e.g.
sync_client.cc:53); are those TODOs satisfied by this refactoring (and can
therefor be removed)?

Also, one version prefers LOG(INFO) while the other uses VLOG(1). Any
preference? I've used LOG(INFO) for now since I assume people running these
tools want to see them by default.

[akalin, 2012/11/30 02:54:31]

There's one more -- the MyTestURLRequestContext, etc..  So I think the TODO
should stay.
You're right, LOG(INFO) is best.

   }
+
+  virtual void GenerateAckHandles(
+      const ObjectIdSet& ids,
+      const scoped_refptr<base::TaskRunner>& task_runner,
+      base::Callback<void(const AckHandleMap&)> callback) OVERRIDE {
+    AckHandleMap ack_handles;
+    for (ObjectIdSet::const_iterator it = ids.begin(); it != ids.end(); ++it) {
+      ack_handles.insert(std::make_pair(*it, AckHandle::InvalidAckHandle()));
+    }
+    task_runner->PostTask(FROM_HERE, base::Bind(callback, ack_handles));

[akalin, 2012/11/28 00:11:42]

process return values (CHECK?)

[dcheng, 2012/11/30 01:42:54]

Done.

+  }
+
+  virtual void Acknowledge(const invalidation::ObjectId& id,
+                           const AckHandle& ack_handle) OVERRIDE {
+    LOG(INFO) << "Received ack for " << ObjectIdToString(id);
+  }
 };
 
 // Needed to use a real host resolver.
 class MyTestURLRequestContext : public net::TestURLRequestContext {
  public:
   MyTestURLRequestContext() : TestURLRequestContext(true) {
     context_storage_.set_host_resolver(
         net::HostResolver::CreateDefaultResolver(NULL));
     context_storage_.set_transport_security_state(
         new net::TransportSecurityState());
@@ skipping 130 matching lines @@
   io_thread.Stop();
   return 0;
 }
 
 }  // namespace
 }  // namespace syncer
 
 int main(int argc, char* argv[]) {
   return syncer::SyncListenNotificationsMain(argc, argv);
 }