Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1681)

Unified Diff: remoting/client/plugin/chromoting_instance.cc

Issue 10453064: Remove V1 authenticators. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: remoting/client/plugin/chromoting_instance.cc
diff --git a/remoting/client/plugin/chromoting_instance.cc b/remoting/client/plugin/chromoting_instance.cc
index fec261e1798b874631f86002ad74df10a2ab56fc..255776258da3d6937e1a88d36f8da1b7f80f7d8d 100644
--- a/remoting/client/plugin/chromoting_instance.cc
+++ b/remoting/client/plugin/chromoting_instance.cc
@@ -110,24 +110,18 @@ const char ChromotingInstance::kApiFeatures[] =
bool ChromotingInstance::ParseAuthMethods(const std::string& auth_methods_str,
ClientConfig* config) {
- 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;
- }
+ 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;

Powered by Google App Engine
This is Rietveld 408576698