diff options
| author | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-22 19:49:21 +0000 |
|---|---|---|
| committer | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-22 19:49:21 +0000 |
| commit | 71a0c6be93d9303fcdcf7a6f7f99201a0fa41618 (patch) | |
| tree | 3dcc118a2e8296be5230f373e4939c73f69d6821 /remoting/jingle_glue | |
| parent | e101fc3da10d9ac1ab490ae13adbd5d25e74eb9a (diff) | |
| download | chromium_src-71a0c6be93d9303fcdcf7a6f7f99201a0fa41618.zip chromium_src-71a0c6be93d9303fcdcf7a6f7f99201a0fa41618.tar.gz chromium_src-71a0c6be93d9303fcdcf7a6f7f99201a0fa41618.tar.bz2 | |
Changes needed to roll libjingle r141 to chrome.
1. Setting ice username and password for P2PTransportChannel.
2. Updating XMPP Auth cookie with Auth Token
Review URL: https://chromiumcodereview.appspot.com/10382003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@138334 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/jingle_glue')
| -rw-r--r-- | remoting/jingle_glue/xmpp_signal_strategy.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/remoting/jingle_glue/xmpp_signal_strategy.cc b/remoting/jingle_glue/xmpp_signal_strategy.cc index 5cac0fc..5969817 100644 --- a/remoting/jingle_glue/xmpp_signal_strategy.cc +++ b/remoting/jingle_glue/xmpp_signal_strategy.cc @@ -61,7 +61,7 @@ void XmppSignalStrategy::Connect() { settings.set_resource(resource_name_); settings.set_use_tls(buzz::TLS_ENABLED); settings.set_token_service(auth_token_service_); - settings.set_auth_cookie(auth_token_); + settings.set_auth_token(buzz::AUTH_MECHANISM_GOOGLE_TOKEN, auth_token_); settings.set_server(talk_base::SocketAddress("talk.google.com", 5222)); buzz::AsyncSocket* socket = new XmppSocketAdapter(settings, false); @@ -221,7 +221,7 @@ buzz::PreXmppAuth* XmppSignalStrategy::CreatePreXmppAuth( } return new notifier::GaiaTokenPreXmppAuth( - jid.Str(), settings.auth_cookie(), settings.token_service(), mechanism); + jid.Str(), settings.auth_token(), settings.token_service(), mechanism); } } // namespace remoting |