Refactor ChannelAuthenticator so that it can be used with Authenticator.

remoting/protocol/pepper_stream_channel.cc

 // Copyright (c) 2011 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/protocol/pepper_stream_channel.h"
 
 #include "base/bind.h"
 #include "crypto/hmac.h"
 #include "jingle/glue/utils.h"
 #include "net/base/cert_status_flags.h"
@@ skipping 218 matching lines @@
     return;
   }
 
   DCHECK(socket_->IsConnected());
   AuthenticateChannel();
 }
 
 void PepperStreamChannel::AuthenticateChannel() {
   DCHECK(CalledOnValidThread());
 
-  authenticator_.reset(new ClientChannelAuthenticator(ssl_client_socket_));
-  authenticator_->Authenticate(
-      session_->shared_secret(),
-      base::Bind(&PepperStreamChannel::OnAuthenticationDone,
-                 base::Unretained(this)));
+  authenticator_.reset(
+      new ClientChannelAuthenticator(session_->shared_secret()));
+  authenticator_->Authenticate(ssl_client_socket_, base::Bind(
+      &PepperStreamChannel::OnAuthenticationDone, base::Unretained(this)));
 }
 
 void PepperStreamChannel::OnAuthenticationDone(
     ChannelAuthenticator::Result result) {
   DCHECK(CalledOnValidThread());
 
   switch (result) {
     case ChannelAuthenticator::SUCCESS:
       NotifyConnected(socket_.release());
       break;
@@ skipping 13 matching lines @@
 void PepperStreamChannel::NotifyConnectFailed() {
   channel_ = NULL;
   owned_channel_.reset();
   socket_.reset();
 
   NotifyConnected(NULL);
 }
 
 }  // namespace protocol
 }  // namespace remoting