Clean up remoting project

remoting/host/client_session.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/host/client_session.h"
 
-#include "base/memory/scoped_ptr.h"
 #include "base/task.h"
 #include "media/base/callback.h"
 #include "remoting/host/user_authenticator.h"
 #include "remoting/proto/auth.pb.h"
 
 namespace remoting {
 
 ClientSession::ClientSession(
     EventHandler* event_handler,
-    const base::Callback<UserAuthenticatorFactory>& auth_factory,
+    UserAuthenticator* user_authenticator,
     scoped_refptr<protocol::ConnectionToClient> connection,
     protocol::InputStub* input_stub)
     : event_handler_(event_handler),
-      auth_factory_(auth_factory),
+      user_authenticator_(user_authenticator),
       connection_(connection),
       input_stub_(input_stub),
       authenticated_(false) {
 }
 
 ClientSession::~ClientSession() {
 }
 
 void ClientSession::SuggestResolution(
     const protocol::SuggestResolutionRequest* msg, Task* done) {
   media::AutoTaskRunner done_runner(done);
 
   if (!authenticated_) {
     LOG(WARNING) << "Invalid control message received "
                  << "(client not authenticated).";
     return;
   }
 }
 
 void ClientSession::BeginSessionRequest(
     const protocol::LocalLoginCredentials* credentials, Task* done) {
   DCHECK(event_handler_);
 
   media::AutoTaskRunner done_runner(done);
 
   bool success = false;
-  scoped_ptr<UserAuthenticator> authenticator(auth_factory_.Run());
   switch (credentials->type()) {
     case protocol::PASSWORD:
-      success = authenticator->Authenticate(credentials->username(),
-                                            credentials->credential());
+      success = user_authenticator_->Authenticate(credentials->username(),
+                                                  credentials->credential());
       break;
 
     default:
       LOG(ERROR) << "Invalid credentials type " << credentials->type();
       break;
   }
 
   if (success) {
     authenticated_ = true;
     event_handler_->LocalLoginSucceeded(connection_.get());
@@ skipping 20 matching lines @@
     input_stub_->InjectMouseEvent(event, done);
   }
 }
 
 void ClientSession::Disconnect() {
   connection_->Disconnect();
   authenticated_ = false;
 }
 
 }  // namespace remoting