Index: remoting/protocol/me2me_host_authenticator_factory.cc |
diff --git a/remoting/protocol/me2me_host_authenticator_factory.cc b/remoting/protocol/me2me_host_authenticator_factory.cc |
index 9a6f60bf29509dc012c84e34b030a7f2138ca05c..5aa93cd039b08a467e3e291e923469d390dd4466 100644 |
--- a/remoting/protocol/me2me_host_authenticator_factory.cc |
+++ b/remoting/protocol/me2me_host_authenticator_factory.cc |
@@ -107,16 +107,9 @@ scoped_ptr<Authenticator> Me2MeHostAuthenticatorFactory::CreateAuthenticator( |
return scoped_ptr<Authenticator>(new RejectingAuthenticator()); |
} |
- if (NegotiatingAuthenticator::IsNegotiableMessage(first_message)) { |
- return NegotiatingAuthenticator::CreateForHost( |
- local_cert_, *local_private_key_, shared_secret_hash_.value, |
- shared_secret_hash_.hash_function); |
- } |
- |
- // TODO(sergeyu): Old clients still use V1 auth protocol. Remove |
- // this once we are done migrating to V2. crbug.com/110483 . |
- return scoped_ptr<Authenticator>(new V1HostAuthenticator( |
- local_cert_, *local_private_key_, "", remote_jid)); |
+ return NegotiatingAuthenticator::CreateForHost( |
+ local_cert_, *local_private_key_, shared_secret_hash_.value, |
+ shared_secret_hash_.hash_function); |
Jamie
2012/02/06 21:03:45
I take it that IsNegotiableMessage was being used
|
} |
} // namespace protocol |