diff options
| author | rmsousa@chromium.org <rmsousa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-11 22:24:40 +0000 |
|---|---|---|
| committer | rmsousa@chromium.org <rmsousa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-11 22:24:40 +0000 |
| commit | b4e6a31aa1c189a5a31a3b284add121a2096713f (patch) | |
| tree | be48c32260a00cd52d932b604890c0f2f24f67d0 /remoting/host/remoting_me2me_host.cc | |
| parent | db46e8a961653096cf5b9ab0bf05d0f39453d9f2 (diff) | |
| download | chromium_src-b4e6a31aa1c189a5a31a3b284add121a2096713f.zip chromium_src-b4e6a31aa1c189a5a31a3b284add121a2096713f.tar.gz chromium_src-b4e6a31aa1c189a5a31a3b284add121a2096713f.tar.bz2 | |
Fix JID checking for cases where the user account does not have a Google email associated with it.
BUG=333464
Review URL: https://codereview.chromium.org/134523007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@244361 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/host/remoting_me2me_host.cc')
| -rw-r--r-- | remoting/host/remoting_me2me_host.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/remoting/host/remoting_me2me_host.cc b/remoting/host/remoting_me2me_host.cc index 21473ee..e227c13 100644 --- a/remoting/host/remoting_me2me_host.cc +++ b/remoting/host/remoting_me2me_host.cc @@ -516,8 +516,8 @@ void HostProcess::CreateAuthenticatorFactory() { if (token_url_.is_empty() && token_validation_url_.is_empty()) { factory = protocol::Me2MeHostAuthenticatorFactory::CreateWithSharedSecret( - host_owner_, local_certificate, key_pair_, host_secret_hash_, - pairing_registry); + use_service_account_, host_owner_, local_certificate, key_pair_, + host_secret_hash_, pairing_registry); } else if (token_url_.is_valid() && token_validation_url_.is_valid()) { scoped_ptr<protocol::ThirdPartyHostAuthenticator::TokenValidatorFactory> @@ -525,7 +525,7 @@ void HostProcess::CreateAuthenticatorFactory() { token_url_, token_validation_url_, key_pair_, context_->url_request_context_getter())); factory = protocol::Me2MeHostAuthenticatorFactory::CreateWithThirdPartyAuth( - host_owner_, local_certificate, key_pair_, + use_service_account_, host_owner_, local_certificate, key_pair_, token_validator_factory.Pass()); } else { |