Use OAuth2 token for sync

jingle/notifier/base/notifier_options_util.cc

Index: jingle/notifier/base/notifier_options_util.cc
diff --git a/jingle/notifier/base/notifier_options_util.cc b/jingle/notifier/base/notifier_options_util.cc
index 93bd173ea8e64b85f636a0e19be7f037ae1eeecb..fa48209ea699a5844288ff88bff8308ff2809cdf 100644
--- a/jingle/notifier/base/notifier_options_util.cc
+++ b/jingle/notifier/base/notifier_options_util.cc
@@ -24,10 +24,13 @@ buzz::XmppClientSettings MakeXmppClientSettings(
   xmpp_client_settings.set_resource("chrome-sync");
   xmpp_client_settings.set_host(jid.domain());
   xmpp_client_settings.set_use_tls(buzz::TLS_ENABLED);
-  xmpp_client_settings.set_auth_token(buzz::AUTH_MECHANISM_GOOGLE_TOKEN,
+  xmpp_client_settings.set_auth_token(notifier_options.auth_mechanism,
       notifier_options.invalidate_xmpp_login ?
       token + "bogus" : token);
-  xmpp_client_settings.set_token_service("chromiumsync");
+  if (notifier_options.auth_mechanism == buzz::AUTH_MECHANISM_OAUTH2)
+    xmpp_client_settings.set_token_service("oauth2");
+  else
+    xmpp_client_settings.set_token_service("chromiumsync");
   if (notifier_options.allow_insecure_connection) {
     xmpp_client_settings.set_allow_plain(true);
     xmpp_client_settings.set_use_tls(buzz::TLS_DISABLED);