Revert 139424 - Remove V1 authenticators.

remoting/client/plugin/chromoting_instance.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_instance.h"
 
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 92 matching lines @@
 static base::LazyInstance<base::Lock>::Leaky
     g_logging_lock = LAZY_INSTANCE_INITIALIZER;
 
 // String sent in the "hello" message to the plugin to describe features.
 const char ChromotingInstance::kApiFeatures[] =
     "highQualityScaling injectKeyEvent sendClipboardItem remapKey trapKey "
     "notifyClientDimensions pauseVideo";
 
 bool ChromotingInstance::ParseAuthMethods(const std::string& auth_methods_str,
                                           ClientConfig* config) {
-  std::vector<std::string> auth_methods;
-  base::SplitString(auth_methods_str, ',', &auth_methods);
-  for (std::vector<std::string>::iterator it = auth_methods.begin();
-       it != auth_methods.end(); ++it) {
-    protocol::AuthenticationMethod authentication_method =
-        protocol::AuthenticationMethod::FromString(*it);
-    if (authentication_method.is_valid())
-      config->authentication_methods.push_back(authentication_method);
-  }
-  if (config->authentication_methods.empty()) {
-    LOG(ERROR) << "No valid authentication methods specified.";
-    return false;
+  if (auth_methods_str == "v1_token") {
+    config->use_v1_authenticator = true;
+  } else {
+    config->use_v1_authenticator = false;
+
+    std::vector<std::string> auth_methods;
+    base::SplitString(auth_methods_str, ',', &auth_methods);
+    for (std::vector<std::string>::iterator it = auth_methods.begin();
+         it != auth_methods.end(); ++it) {
+      protocol::AuthenticationMethod authentication_method =
+          protocol::AuthenticationMethod::FromString(*it);
+      if (authentication_method.is_valid())
+        config->authentication_methods.push_back(authentication_method);
+    }
+    if (config->authentication_methods.empty()) {
+      LOG(ERROR) << "No valid authentication methods specified.";
+      return false;
+    }
   }
 
   return true;
 }
 
 ChromotingInstance::ChromotingInstance(PP_Instance pp_instance)
     : pp::InstancePrivate(pp_instance),
       initialized_(false),
       plugin_message_loop_(
           new PluginMessageLoopProxy(&plugin_thread_delegate_)),
@@ skipping 551 matching lines @@
   }
   g_logging_to_plugin = false;
 }
 
 bool ChromotingInstance::IsConnected() {
   return host_connection_.get() &&
     (host_connection_->state() == protocol::ConnectionToHost::CONNECTED);
 }
 
 }  // namespace remoting