Added support for other authentication mechanisms in jingle. This will allow ...

jingle/notifier/base/notifier_options.h

 // Copyright (c) 2010 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.
 
 #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.
   bool try_ssltcp_first;
 
   // Indicates that insecure connections (e.g., plain authentication,
   // no TLS) are allowed.  Only used for testing.
   bool allow_insecure_connection;
 
   // Indicates that the login info passed to XMPP is invalidated so
   // that login fails.
   bool invalidate_xmpp_login;
 
   // Contains a custom URL and port for the notification server, if one is to
   // be used. Empty otherwise.
   net::HostPortPair xmpp_host_port;
 
   // 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),

[akalin, 2011/03/09 01:02:41]

punctuation nit: should be:

"X-OAUTH2", etc.).

+  std::string auth_mechanism;
 };
 
 }  // namespace notifier
 
 #endif  // JINGLE_NOTIFIER_BASE_NOTIFIER_OPTIONS_H_