| Index: remoting/jingle_glue/jingle_test_client.cc
|
| ===================================================================
|
| --- remoting/jingle_glue/jingle_test_client.cc (revision 49299)
|
| +++ remoting/jingle_glue/jingle_test_client.cc (working copy)
|
| @@ -15,13 +15,11 @@
|
|
|
| #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)
|
| @@ -53,10 +51,10 @@
|
| 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);
|
| @@ -146,13 +144,16 @@
|
| 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;
|
| }
|
|
|