Revert "Fix crashes in ChromotingHost"

remoting/protocol/connection_to_client.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_PROTOCOL_CONNECTION_TO_CLIENT_H_
 #define REMOTING_PROTOCOL_CONNECTION_TO_CLIENT_H_
 
 #include <deque>
 #include <vector>
 
@@ skipping 37 matching lines @@
   // that this object runs on. A viewer object receives events and messages from
   // a libjingle channel, these events are delegated to |handler|.
   // It is guranteed that |handler| is called only on the |message_loop|.
   ConnectionToClient(MessageLoop* message_loop,
                      EventHandler* handler,
                      HostStub* host_stub,
                      InputStub* input_stub);
 
   virtual ~ConnectionToClient();
 
-  virtual void Init(Session* session);
+  virtual void Init(protocol::Session* session);
 
   // Returns the connection in use.
-  virtual Session* session();
+  virtual protocol::Session* session();
 
   // Disconnect the client connection. This method is allowed to be called
   // more than once and calls after the first one will be ignored.
   //
   // After this method is called all the send method calls will be ignored.
   virtual void Disconnect();
 
   // Send encoded update stream data to the viewer.
   virtual VideoStub* video_stub();
 
   // Return pointer to ClientStub.
   virtual ClientStub* client_stub();
 
  protected:
   // Protected constructor used by unit test.
   ConnectionToClient();
 
  private:
   // Callback for protocol Session.
-  void OnSessionStateChange(Session::State state);
+  void OnSessionStateChange(protocol::Session::State state);
 
   // Process a libjingle state change event on the |loop_|.
-  void StateChangeTask(Session::State state);
+  void StateChangeTask(protocol::Session::State state);
 
   void OnClosed();
 
   // The libjingle channel used to send and receive data from the remote client.
-  scoped_refptr<Session> session_;
+  scoped_refptr<protocol::Session> session_;
 
   scoped_ptr<VideoWriter> video_writer_;
 
   // ClientStub for sending messages to the client.
   scoped_ptr<ClientStub> client_stub_;
 
   // The message loop that this object runs on.
   MessageLoop* loop_;
 
   // Event handler for handling events sent from this object.
   EventHandler* handler_;
 
   // HostStub for receiving control events from the client.
   HostStub* host_stub_;
 
   // InputStub for receiving input events from the client.
   InputStub* input_stub_;
 
   // Dispatcher for submitting messages to stubs.
   scoped_ptr<HostMessageDispatcher> dispatcher_;
 
   DISALLOW_COPY_AND_ASSIGN(ConnectionToClient);
 };
 
 }  // namespace protocol
 }  // namespace remoting
 
 #endif  // REMOTING_PROTOCOL_CONNECTION_TO_CLIENT_H_