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

remoting/jingle_glue/jingle_test_client.cc

 // 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.
 
 #include "build/build_config.h"
 
 #if !defined(OS_WIN)
 extern "C" {
 #include <unistd.h>
 }
 #endif  // !defined(OS_WIN)
 
 #include <iostream>
 #include <list>
 
 #include "base/at_exit.h"
 #include "media/base/data_buffer.h"
-#include "remoting/base/constants.h"
 #include "remoting/jingle_glue/jingle_channel.h"
 #include "remoting/jingle_glue/jingle_client.h"
 
 using remoting::JingleClient;
 using remoting::JingleChannel;
-using remoting::kChromotingTokenServiceName;
 
 void SetConsoleEcho(bool on) {
 #if defined(OS_WIN)
   HANDLE hIn = GetStdHandle(STD_INPUT_HANDLE);
   if ((hIn == INVALID_HANDLE_VALUE) || (hIn == NULL))
     return;
 
   DWORD mode;
   if (!GetConsoleMode(hIn, &mode))
     return;
@@ skipping 11 matching lines @@
   else
     system("stty -echo");
 #endif  // !defined(OS_WIN)
 }
 
 class JingleTestClient : public JingleChannel::Callback,
                          public JingleClient::Callback {
  public:
   virtual ~JingleTestClient() {}
 
-  void Run(const std::string& username, const std::string& auth_token,
+  void Run(const std::string& username, const std::string& password,
            const std::string& host_jid) {
     client_ = new JingleClient();
-    client_->Init(username, auth_token, kChromotingTokenServiceName, this);
+    client_->Init(username, password, this);
 
     if (host_jid != "") {
       scoped_refptr<JingleChannel> channel = client_->Connect(host_jid, this);
       channels_.push_back(channel);
     }
 
     while (true) {
       std::string line;
       std::getline(std::cin, line);
 
@@ skipping 69 matching lines @@
     std::cerr << "Usage: " << argv[0] << " [<host_jid>]" << std::endl;
 
   base::AtExitManager exit_manager;
 
   std::string host_jid = argc == 2 ? argv[1] : "";
 
   std::string username;
   std::cout << "JID: ";
   std::cin >> username;
 
-  std::string auth_token;
-  std::cout << "Auth token: ";
-  std::cin >> auth_token;
+  std::string password;
+  SetConsoleEcho(false);
+  std::cout << "Password: ";
+  std::cin >> password;
+  SetConsoleEcho(true);
+  std::cout << std::endl;
 
   JingleTestClient client;
 
-  client.Run(username, auth_token, host_jid);
+  client.Run(username, password, host_jid);
 
   return 0;
 }