Rename classes for Chromoting:

remoting/host/chromoting_host.h

 // 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.
 
 #ifndef REMOTING_CHROMOTING_HOST_H_
 #define REMOTING_CHROMOTING_HOST_H_
 
 #include <string>
 
 #include "base/thread.h"
 #include "remoting/base/encoder.h"
 #include "remoting/host/access_verifier.h"
 #include "remoting/host/capturer.h"
 #include "remoting/host/client_connection.h"
 #include "remoting/host/event_executor.h"
 #include "remoting/host/heartbeat_sender.h"
 #include "remoting/jingle_glue/jingle_client.h"
 #include "remoting/jingle_glue/jingle_thread.h"
-#include "remoting/protocol/chromotocol_server.h"
+#include "remoting/protocol/session_manager.h"
 
 class Task;
 
 namespace remoting {
 
 class Capturer;
 class ChromotingHostContext;
 class ChromotocolConfig;
 class Encoder;
 class EventExecutor;
@@ skipping 59 matching lines @@
                              ChromotingClientMessage* message);
   virtual void OnConnectionOpened(ClientConnection* client);
   virtual void OnConnectionClosed(ClientConnection* client);
   virtual void OnConnectionFailed(ClientConnection* client);
 
   ////////////////////////////////////////////////////////////////////////////
   // JingleClient::Callback implementations
   virtual void OnStateChange(JingleClient* client, JingleClient::State state);
 
   // Callback for ChromotingServer.
-  void OnNewClientConnection(
-      ChromotocolConnection* connection,
-      ChromotocolServer::IncomingConnectionResponse* response);
+  void OnNewClientSession(
+      protocol::Session* session,
+      protocol::SessionManager::IncomingSessionResponse* response);
 
  private:
   enum State {
     kInitial,
     kStarted,
     kStopped,
   };
 
   // This method connects to the talk network and start listening for incoming
   // connections.
   void DoStart(Task* shutdown_task);
 
-  // Callback for ChromotocolServer::Close().
+  // Callback for protocol::SessionManager::Close().
   void OnServerClosed();
 
   // Creates encoder for the specified configuration.
   Encoder* CreateEncoder(const ChromotocolConfig* config);
 
   // The context that the chromoting host runs on.
   ChromotingHostContext* context_;
 
   scoped_refptr<MutableHostConfig> config_;
 
   // Capturer to be used by SessionManager. Once the SessionManager is
   // constructed this is set to NULL.
   scoped_ptr<Capturer> capturer_;
 
   // constructed this is set to NULL.
   scoped_ptr<Encoder> encoder_;
 
   // EventExecutor executes input events received from the client.
   scoped_ptr<EventExecutor> executor_;
 
   // The libjingle client. This is used to connect to the talk network to
   // receive connection requests from chromoting client.
   scoped_refptr<JingleClient> jingle_client_;
 
-  scoped_refptr<ChromotocolServer> chromotocol_server_;
+  scoped_refptr<protocol::SessionManager> session_manager_;
 
   // Objects that takes care of sending heartbeats to the chromoting bot.
   scoped_refptr<HeartbeatSender> heartbeat_sender_;
 
   AccessVerifier access_verifier_;
 
   // A ClientConnection manages the connectino to a remote client.
   // TODO(hclam): Expand this to a list of clients.
   scoped_refptr<ClientConnection> client_;
 
@@ skipping 11 matching lines @@
 
   // Lock is to lock the access to |state_|.
   Lock lock_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromotingHost);
 };
 
 }  // namespace remoting
 
 #endif  // REMOTING_HOST_CHROMOTING_HOST_H_