Refactor ZLib and Verbatim encoders.

remoting/jingle_glue/jingle_client.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 "remoting/jingle_glue/jingle_client.h"
 
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "jingle/notifier/communicator/gaia_token_pre_xmpp_auth.h"
 #include "remoting/jingle_glue/iq_request.h"
@@ skipping 150 matching lines @@
       break;
     case buzz::XmppEngine::STATE_OPENING:
       UpdateState(CONNECTING);
       break;
     case buzz::XmppEngine::STATE_OPEN:
       SetFullJid(client_->jid().Str());
       UpdateState(CONNECTED);
       break;
     case buzz::XmppEngine::STATE_CLOSED:
       UpdateState(CLOSED);
+      // Client is destroyed by the TaskRunner after the client is
+      // closed. Reset the pointer so we don't try to use it later.
+      client_ = NULL;
       break;
     default:
       NOTREACHED();
       break;
   }
 }
 
 void JingleClient::SetFullJid(const std::string& full_jid) {
   AutoLock auto_lock(full_jid_lock_);
   full_jid_ = full_jid;
@@ skipping 13 matching lines @@
 }
 
 buzz::PreXmppAuth* JingleClient::CreatePreXmppAuth(
     const buzz::XmppClientSettings& settings) {
   buzz::Jid jid(settings.user(), settings.host(), buzz::STR_EMPTY);
   return new notifier::GaiaTokenPreXmppAuth(jid.Str(), settings.auth_cookie(),
                                             settings.token_service());
 }
 
 }  // namespace remoting