Revert "Fix crashes in ChromotingHost"

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/threading/thread.h"
@@ skipping 46 matching lines @@
 //
 // 3. When the user is disconnected, we will pause the ScreenRecorder
 //    and try to terminate the threads we have created. This will allow
 //    all pending tasks to complete. After all of that completed we
 //    return to the idle state. We then go to step (2) if there a new
 //    incoming connection.
 class ChromotingHost : public base::RefCountedThreadSafe<ChromotingHost>,
                        public protocol::ConnectionToClient::EventHandler,
                        public JingleClient::Callback {
  public:
-  // Factory methods that must be used to create ChromotingHost instances.
-  // Default capturer and input stub are used if it is not specified.
+  // Factory methods that must be used to create ChromotingHost
+  // instances.  Default capturer is used if it is not specified.
   static ChromotingHost* Create(ChromotingHostContext* context,
                                 MutableHostConfig* config);
   static ChromotingHost* Create(ChromotingHostContext* context,
                                 MutableHostConfig* config,
-                                Capturer* capturer,
-                                protocol::InputStub* input_stub);
+                                Capturer* capturer);
 
   // Asynchronously start the host process.
   //
   // After this is invoked, the host process will connect to the talk
   // network and start listening for incoming connections.
   //
   // |shutdown_task| is called if Start() has failed ot Shutdown() is called
   // and all related operations are completed.
   //
   // This method can only be called once during the lifetime of this object.
@@ skipping 23 matching lines @@
       protocol::Session* session,
       protocol::SessionManager::IncomingSessionResponse* response);
 
   // Sets desired configuration for the protocol. Ownership of the
   // |config| is transferred to the object. Must be called before Start().
   void set_protocol_config(protocol::CandidateSessionConfig* config);
 
  private:
   friend class base::RefCountedThreadSafe<ChromotingHost>;
   ChromotingHost(ChromotingHostContext* context, MutableHostConfig* config,
-                 Capturer* capturer, protocol::InputStub* input_stub);
+                 Capturer* capturer);
   virtual ~ChromotingHost();
 
   enum State {
     kInitial,
     kStarted,
     kStopped,
   };
 
   // Callback for protocol::SessionManager::Close().
   void OnServerClosed();
@@ skipping 50 matching lines @@
 
   // Configuration of the protocol.
   scoped_ptr<protocol::CandidateSessionConfig> protocol_config_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromotingHost);
 };
 
 }  // namespace remoting
 
 #endif  // REMOTING_HOST_CHROMOTING_HOST_H_