| Index: remoting/protocol/negotiating_client_authenticator.h
|
| diff --git a/remoting/protocol/negotiating_client_authenticator.h b/remoting/protocol/negotiating_client_authenticator.h
|
| index 1c03afd976eb81c93c0b5c2ffc9137e4e93b85ab..c664a6555915ca51a9722d01a6136c3ba089fb80 100644
|
| --- a/remoting/protocol/negotiating_client_authenticator.h
|
| +++ b/remoting/protocol/negotiating_client_authenticator.h
|
| @@ -11,7 +11,6 @@
|
| #include "base/macros.h"
|
| #include "base/memory/scoped_ptr.h"
|
| #include "base/memory/weak_ptr.h"
|
| -#include "remoting/protocol/authentication_method.h"
|
| #include "remoting/protocol/authenticator.h"
|
| #include "remoting/protocol/negotiating_authenticator_base.h"
|
| #include "remoting/protocol/third_party_client_authenticator.h"
|
| @@ -29,8 +28,7 @@ class NegotiatingClientAuthenticator : public NegotiatingAuthenticatorBase {
|
| const std::string& shared_secret,
|
| const std::string& authentication_tag,
|
| const FetchSecretCallback& fetch_secret_callback,
|
| - scoped_ptr<ThirdPartyClientAuthenticator::TokenFetcher> token_fetcher_,
|
| - const std::vector<AuthenticationMethod>& methods);
|
| + scoped_ptr<ThirdPartyClientAuthenticator::TokenFetcher> token_fetcher_);
|
|
|
| ~NegotiatingClientAuthenticator() override;
|
|
|
| @@ -80,7 +78,7 @@ class NegotiatingClientAuthenticator : public NegotiatingAuthenticatorBase {
|
| scoped_ptr<ThirdPartyClientAuthenticator::TokenFetcher> token_fetcher_;
|
|
|
| // Internal NegotiatingClientAuthenticator data.
|
| - bool method_set_by_host_;
|
| + bool method_set_by_host_ = false;
|
| base::WeakPtrFactory<NegotiatingClientAuthenticator> weak_factory_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(NegotiatingClientAuthenticator);
|
|
|