Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / sync / tools / sync_listen_notifications.cc

diff --git a/src/sync/tools/sync_listen_notifications.cc b/src/sync/tools/sync_listen_notifications.cc
index f9d1989..3fa5a33 100644 (file)
--- a/src/sync/tools/sync_listen_notifications.cc
+++ b/src/sync/tools/sync_listen_notifications.cc
@@ -15,6 +15,12 @@
 #include "base/message_loop/message_loop.h"
 #include "base/rand_util.h"
 #include "base/threading/thread.h"
+#include "components/invalidation/invalidation_handler.h"
+#include "components/invalidation/invalidation_state_tracker.h"
+#include "components/invalidation/invalidation_util.h"
+#include "components/invalidation/invalidator.h"
+#include "components/invalidation/non_blocking_invalidator.h"
+#include "components/invalidation/object_id_invalidation_map.h"
 #include "jingle/notifier/base/notification_method.h"
 #include "jingle/notifier/base/notifier_options.h"
 #include "net/base/host_port_pair.h"
@@ -23,11 +29,7 @@
 #include "net/http/transport_security_state.h"
 #include "net/url_request/url_request_test_util.h"
 #include "sync/internal_api/public/base/model_type.h"
-#include "sync/notifier/invalidation_handler.h"
-#include "sync/notifier/invalidation_state_tracker.h"
-#include "sync/notifier/invalidation_util.h"
-#include "sync/notifier/invalidator.h"
-#include "sync/notifier/non_blocking_invalidator.h"
+#include "sync/tools/invalidation_helper.h"
 #include "sync/tools/null_invalidation_state_tracker.h"
 
 #if defined(OS_MACOSX)
@@ -50,15 +52,15 @@ const char kAllowInsecureConnectionSwitch[] = "allow-insecure-connection";
 class NotificationPrinter : public InvalidationHandler {
  public:
   NotificationPrinter() {}
-  virtual ~NotificationPrinter() {}
+  ~NotificationPrinter() override {}
 
-  virtual void OnInvalidatorStateChange(InvalidatorState state) OVERRIDE {
+  void OnInvalidatorStateChange(InvalidatorState state) override {
     LOG(INFO) << "Invalidator state changed to "
               << InvalidatorStateToString(state);
   }
 
-  virtual void OnIncomingInvalidation(
-      const ObjectIdInvalidationMap& invalidation_map) OVERRIDE {
+  void OnIncomingInvalidation(
+      const ObjectIdInvalidationMap& invalidation_map) override {
     ObjectIdSet ids = invalidation_map.GetObjectIds();
     for (ObjectIdSet::const_iterator it = ids.begin(); it != ids.end(); ++it) {
       LOG(INFO) << "Remote invalidation: "
@@ -66,6 +68,8 @@ class NotificationPrinter : public InvalidationHandler {
     }
   }
 
+  std::string GetOwnerName() const override { return "NotificationPrinter"; }
+
  private:
   DISALLOW_COPY_AND_ASSIGN(NotificationPrinter);
 };
@@ -81,16 +85,16 @@ class MyTestURLRequestContext : public net::TestURLRequestContext {
     Init();
   }
 
-  virtual ~MyTestURLRequestContext() {}
+  ~MyTestURLRequestContext() override {}
 };
 
 class MyTestURLRequestContextGetter : public net::TestURLRequestContextGetter {
  public:
   explicit MyTestURLRequestContextGetter(
-      const scoped_refptr<base::MessageLoopProxy>& io_message_loop_proxy)
-      : TestURLRequestContextGetter(io_message_loop_proxy) {}
+      const scoped_refptr<base::SingleThreadTaskRunner>& io_task_runner)
+      : TestURLRequestContextGetter(io_task_runner) {}
 
-  virtual net::TestURLRequestContext* GetURLRequestContext() OVERRIDE {
+  net::TestURLRequestContext* GetURLRequestContext() override {
     // Construct |context_| lazily so it gets constructed on the right
     // thread (the IO thread).
     if (!context_)
@@ -99,7 +103,7 @@ class MyTestURLRequestContextGetter : public net::TestURLRequestContextGetter {
   }
 
  private:
-  virtual ~MyTestURLRequestContextGetter() {}
+  ~MyTestURLRequestContextGetter() override {}
 
   scoped_ptr<MyTestURLRequestContext> context_;
 };
@@ -176,17 +180,20 @@ int SyncListenNotificationsMain(int argc, char* argv[]) {
       ParseNotifierOptions(
           command_line,
           new MyTestURLRequestContextGetter(io_thread.message_loop_proxy()));
+  syncer::NetworkChannelCreator network_channel_creator =
+      syncer::NonBlockingInvalidator::MakePushClientChannelCreator(
+          notifier_options);
   const char kClientInfo[] = "sync_listen_notifications";
   NullInvalidationStateTracker null_invalidation_state_tracker;
   scoped_ptr<Invalidator> invalidator(
       new NonBlockingInvalidator(
-          notifier_options,
+          network_channel_creator,
           base::RandBytesAsString(8),
-          null_invalidation_state_tracker.GetAllInvalidationStates(),
+          null_invalidation_state_tracker.GetSavedInvalidations(),
           null_invalidation_state_tracker.GetBootstrapData(),
-          WeakHandle<InvalidationStateTracker>(
-              null_invalidation_state_tracker.AsWeakPtr()),
-          kClientInfo));
+          &null_invalidation_state_tracker,
+          kClientInfo,
+          notifier_options.request_context_getter));
 
   NotificationPrinter notification_printer;