Revert 49298 - Broke compile - Token-based authentication for chromoting....

remoting/host/simple_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_SIMPLE_HOST_H_
 #define REMOTING_SIMPLE_HOST_H_
 
 #include <string>
 
 #include "base/thread.h"
@@ skipping 29 matching lines @@
 //
 // 3. When the user is disconencted, we will pause the SessionManager
 //    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 SimpleHost : public base::RefCountedThreadSafe<SimpleHost>,
                    public ClientConnection::EventHandler,
                    public JingleClient::Callback {
  public:
-  SimpleHost(const std::string& username, const std::string& auth_token,
+  SimpleHost(const std::string& username, const std::string& password,
              Capturer* capturer, Encoder* encoder, EventExecutor* executor);
 
   // Run the host porcess. This method returns only after the message loop
   // of the host process exits.
   void Run();
 
   // This method is called when we need to the host process.
   void DestroySession();
 
   // This method talks to the cloud to register the host process. If
@@ skipping 28 matching lines @@
   // The message loop that this class runs on.
   MessageLoop main_loop_;
 
   // A thread that hosts capture operations.
   base::Thread capture_thread_;
 
   // A thread that hosts encode operations.
   base::Thread encode_thread_;
 
   std::string username_;
-  std::string auth_token_;
+  std::string password_;
 
   // Capturer to be used by SessionManager. Once the SessionManager is
   // constructed this is set to NULL.
   scoped_ptr<Capturer> capturer_;
 
   // Encoder to be used by the SessionManager. Once the SessionManager is
   // constructed this is set to NULL.
   scoped_ptr<Encoder> encoder_;
 
   // EventExecutor executes input events received from the client.
@@ skipping 12 matching lines @@
 
   // Session manager for the host process.
   scoped_refptr<SessionManager> session_;
 
   DISALLOW_COPY_AND_ASSIGN(SimpleHost);
 };
 
 }  // namespace remoting
 
 #endif  // REMOTING_HOST_SIMPLE_HOST_H_