Fixed CacheInvalidationPacketHandler crash.

chrome/browser/sync/notifier/cache_invalidation_packet_handler.cc

 // Copyright (c) 2010 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/sync/notifier/cache_invalidation_packet_handler.h"
 
 #include <string>
 
 #include "base/base64.h"
 #include "base/callback.h"
+#include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "base/rand_util.h"
 #include "base/string_number_conversions.h"
 //#include "base/string_util.h"
 #include "chrome/browser/sync/sync_constants.h"
 #include "google/cacheinvalidation/invalidation-client.h"
 #include "jingle/notifier/listener/xml_element_util.h"
 #include "talk/xmpp/constants.h"
 #include "talk/xmpp/jid.h"
 #include "talk/xmpp/xmppclient.h"
@@ skipping 169 matching lines @@
 std::string MakeSid() {
   uint64 sid = base::RandUint64();
   return std::string("chrome-sync-") + base::Uint64ToString(sid);
 }
 
 }  // namespace
 
 CacheInvalidationPacketHandler::CacheInvalidationPacketHandler(
     buzz::XmppClient* xmpp_client,
     invalidation::InvalidationClient* invalidation_client)
-    : xmpp_client_(xmpp_client),
+    : scoped_callback_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)),
+      xmpp_client_(xmpp_client),
       invalidation_client_(invalidation_client),
       seq_(0),
       sid_(MakeSid()) {
   CHECK(xmpp_client_);
   CHECK(invalidation_client_);
   invalidation::NetworkEndpoint* network_endpoint =
       invalidation_client_->network_endpoint();
   CHECK(network_endpoint);
   network_endpoint->RegisterOutboundListener(
-      invalidation::NewPermanentCallback(
-          this,
+      scoped_callback_factory_.NewCallback(
           &CacheInvalidationPacketHandler::HandleOutboundPacket));
   // Owned by xmpp_client.
   CacheInvalidationListenTask* listen_task =
       new CacheInvalidationListenTask(
-          xmpp_client, NewCallback(
-              this, &CacheInvalidationPacketHandler::HandleInboundPacket));
+          xmpp_client, scoped_callback_factory_.NewCallback(
+              &CacheInvalidationPacketHandler::HandleInboundPacket));
   listen_task->Start();
 }
 
 CacheInvalidationPacketHandler::~CacheInvalidationPacketHandler() {
   invalidation::NetworkEndpoint* network_endpoint =
       invalidation_client_->network_endpoint();
   CHECK(network_endpoint);
   network_endpoint->RegisterOutboundListener(NULL);
 }
 
@@ skipping 25 matching lines @@
   std::string decoded_message;
   if (!base::Base64Decode(packet, &decoded_message)) {
     LOG(ERROR) << "Could not base64-decode received message: "
                << packet;
     return;
   }
   network_endpoint->HandleInboundMessage(decoded_message);
 }
 
 }  // namespace sync_notifier