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),
@@ skipping 11 matching lines @@
   // 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),
+  // If left empty, the underlying login code uses "X-GOOGLE-TOKEN" by default.
+  std::string auth_mechanism;

[akalin, 2011/03/08 22:55:37]

What do you think about using an enum to pass around instead?  It's a bit more
code (since you have to have an enum to string map somewhere) but it's clearer
in client code.  Also avoids empty-string-as-default.

[sanjeevr, 2011/03/08 23:01:41]

I used a string because it maps well to the SaslCookieMechanism class which also
takes in a string. That way, there are no new code changes needed to support a
new auth mechanism.  

[akalin, 2011/03/08 23:44:36]

Fair enough.  Although I expect we'll eventually standardize on oauth
eventually.

On 2011/03/08 23:01:41, sanjeevr wrote:

 };
 
 }  // namespace notifier
 
 #endif  // JINGLE_NOTIFIER_BASE_NOTIFIER_OPTIONS_H_