Revert 139424 - Remove V1 authenticators.

remoting/client/plugin/chromoting_scriptable_object.cc

 // Copyright (c) 2012 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/client/plugin/chromoting_scriptable_object.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/logging.h"
 #include "base/message_loop_proxy.h"
@@ skipping 372 matching lines @@
     return Var();
   }
   config.local_jid = args[arg++].AsString();
 
   if (!args[arg].is_string()) {
     *exception = Var("The shared_secret must be a string.");
     return Var();
   }
   config.shared_secret = args[arg++].AsString();
 
-  if (!args[arg].is_string()) {
-    *exception = Var("The authentication_methods must be a string.");
-    return Var();
+  // Older versions of the webapp do not supply the following two
+  // parameters.
+
+  // By default use V1 authentication.
+  config.use_v1_authenticator = true;
+  if (args.size() > arg) {
+    if (!args[arg].is_string()) {
+      *exception = Var("The authentication_methods must be a string.");
+      return Var();
+    }
+
+    if (!ChromotingInstance::ParseAuthMethods(
+            args[arg++].AsString(), &config)) {
+      *exception = Var("No valid authentication methods specified.");
+      return Var();
+    }
   }
 
-  if (!ChromotingInstance::ParseAuthMethods(
-          args[arg++].AsString(), &config)) {
-    *exception = Var("No valid authentication methods specified.");
-    return Var();
+  if (args.size() > arg) {
+    if (!args[arg].is_string()) {
+      *exception = Var("The authentication_tag must be a string.");
+      return Var();
+    }
+    config.authentication_tag = args[arg++].AsString();
   }
 
-  if (!args[arg].is_string()) {
-    *exception = Var("The authentication_tag must be a string.");
-    return Var();
-  }
-  config.authentication_tag = args[arg++].AsString();
-
   if (args.size() != arg) {
     *exception = Var("Too many agruments passed to connect().");
     return Var();
   }
 
   VLOG(1) << "Connecting to host. "
           << "client_jid: " << config.local_jid
           << ", host_jid: " << config.host_jid;
   instance_->Connect(config);
 
@@ skipping 33 matching lines @@
     const std::vector<pp::Var>& args, pp::Var* exception) {
   if (args.size() != 0) {
     *exception = Var("Usage: DoReleaseAllKeys()");
     return Var();
   }
   instance_->ReleaseAllKeys();
   return Var();
 }
 
 }  // namespace remoting