Added support for other authentication mechanisms in jingle. This will allow us to use OAuth2 tokens when OAuth2 support is ready in Talk.

BUG=None
TEST=Test cloud print and sync for regressions.

Review URL: http://codereview.chromium.org/6649006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@77434 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 25 insertions, 5 deletions

diff --git a/jingle/notifier/base/notifier_options.cc b/jingle/notifier/base/notifier_options.cc
new file mode 100644
index 0000000..6191af1
--- /dev/null
+++ b/jingle/notifier/base/notifier_options.cc
@@ -0,0 +1,19 @@
+// 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 "jingle/notifier/base/notifier_options.h"
+
+// TODO(akalin): Fix the cross-directory dependency.
+#include "jingle/notifier/communicator/gaia_token_pre_xmpp_auth.h"
+
+namespace notifier {
+
+NotifierOptions::NotifierOptions()
+    : try_ssltcp_first(false),
+      allow_insecure_connection(false),
+      invalidate_xmpp_login(false),
+      notification_method(kDefaultNotificationMethod),
+      auth_mechanism(GaiaTokenPreXmppAuth::kDefaultAuthMechanism) {}
+
+}  // namespace notifier
diff --git a/jingle/notifier/base/notifier_options.h b/jingle/notifier/base/notifier_options.h
index ec63cdb..5cd4243 100644
--- a/jingle/notifier/base/notifier_options.h
+++ b/jingle/notifier/base/notifier_options.h
@@ -5,17 +5,15 @@
 #ifndef JINGLE_NOTIFIER_BASE_NOTIFIER_OPTIONS_H_
 #define JINGLE_NOTIFIER_BASE_NOTIFIER_OPTIONS_H_
 
+#include <string>
+
 #include "jingle/notifier/base/notification_method.h"
 #include "net/base/host_port_pair.h"
 
 namespace notifier {
 
 struct NotifierOptions {
-  NotifierOptions()
-      : try_ssltcp_first(false),
-        allow_insecure_connection(false),
-        invalidate_xmpp_login(false),
-        notification_method(kDefaultNotificationMethod) {}
+  NotifierOptions();
 
   // Indicates that the SSLTCP port (443) is to be tried before the the XMPP
   // port (5222) during login.
@@ -36,6 +34,9 @@ struct NotifierOptions {
   // Indicates the method used by sync clients while sending and listening to
   // notifications.
   NotificationMethod notification_method;
+
+  // Specifies the auth mechanism to use ("X-GOOGLE-TOKEN", "X-OAUTH2", etc),
+  std::string auth_mechanism;
 };
 
 }  // namespace notifier