Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / components / invalidation / gcm_invalidation_bridge.cc

diff --git a/src/components/invalidation/gcm_invalidation_bridge.cc b/src/components/invalidation/gcm_invalidation_bridge.cc
index 23f40af..691be33 100644 (file)
--- a/src/components/invalidation/gcm_invalidation_bridge.cc
+++ b/src/components/invalidation/gcm_invalidation_bridge.cc
@@ -165,8 +165,10 @@ GCMInvalidationBridge::GCMInvalidationBridge(
       weak_factory_(this) {}
 
 GCMInvalidationBridge::~GCMInvalidationBridge() {
-  if (subscribed_for_incoming_messages_)
+  if (subscribed_for_incoming_messages_) {
     gcm_driver_->RemoveAppHandler(kInvalidationsAppId);
+    gcm_driver_->RemoveConnectionObserver(this);
+  }
 }
 
 scoped_ptr<syncer::GCMNetworkChannelDelegate>
@@ -285,6 +287,7 @@ void GCMInvalidationBridge::SubscribeForIncomingMessages() {
 
   DCHECK(!subscribed_for_incoming_messages_);
   gcm_driver_->AddAppHandler(kInvalidationsAppId, this);
+  gcm_driver_->AddConnectionObserver(this);
   core_thread_task_runner_->PostTask(
       FROM_HERE,
       base::Bind(&GCMInvalidationBridge::Core::OnConnectionStateChanged,