Wire in OAuth2 support into non-sandboxed connections in libjingle.

remoting/jingle_glue/jingle_client.cc

 // Copyright (c) 2011 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 "remoting/jingle_glue/jingle_client.h"
 
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "jingle/notifier/base/gaia_token_pre_xmpp_auth.h"
@@ skipping 96 matching lines @@
       break;
     default:
       NOTREACHED();
       break;
   }
 }
 
 buzz::PreXmppAuth* XmppSignalStrategy::CreatePreXmppAuth(
     const buzz::XmppClientSettings& settings) {
   buzz::Jid jid(settings.user(), settings.host(), buzz::STR_EMPTY);
+  std::string mechanism = notifier::GaiaTokenPreXmppAuth::kDefaultAuthMechanism;
+  if (settings.token_service() == "oauth2") {
+    mechanism = "X-OAUTH2";
+  }
+
   return new notifier::GaiaTokenPreXmppAuth(
       jid.Str(),
       settings.auth_cookie(),
       settings.token_service(),
-      notifier::GaiaTokenPreXmppAuth::kDefaultAuthMechanism);
+      mechanism);
 }
 
 
 JavascriptSignalStrategy::JavascriptSignalStrategy(const std::string& your_jid)
     : your_jid_(your_jid) {
 }
 
 JavascriptSignalStrategy::~JavascriptSignalStrategy() {
 }
 
@@ skipping 222 matching lines @@
               << ", stun: " << stun_servers;
     port_allocator_->SetRelayToken(token);
     port_allocator_->SetStunHosts(stun_hosts);
     port_allocator_->SetRelayHosts(relay_hosts);
   } else {
     LOG(INFO) << "Jingle info found but no port allocator.";
   }
 }
 
 }  // namespace remoting