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

Unified Diff: chromeos/components/tether/tether_host_fetcher.cc

Issue 2801353002: [CrOS Tether] Fill out the Initializer class. Tether will now initialize fully once the flag is ena… (Closed)
Patch Set: Added missing dep. Created 3 years, 8 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: chromeos/components/tether/tether_host_fetcher.cc
diff --git a/chromeos/components/tether/tether_host_fetcher.cc b/chromeos/components/tether/tether_host_fetcher.cc
index 4f13a3c80e7ca842459f2a379204cb815d2a555b..2c98fccdea5aa90a6e3710f7bc121c0e78722784 100644
--- a/chromeos/components/tether/tether_host_fetcher.cc
+++ b/chromeos/components/tether/tether_host_fetcher.cc
@@ -7,6 +7,7 @@
#include "base/bind.h"
#include "base/memory/ptr_util.h"
#include "components/cryptauth/cryptauth_device_manager.h"
+#include "components/cryptauth/cryptauth_enrollment_manager.h"
#include "components/cryptauth/cryptauth_service.h"
#include "components/cryptauth/remote_device_loader.h"
#include "components/cryptauth/secure_message_delegate.h"
@@ -33,15 +34,8 @@ TetherHostFetcher::TetherHostFetchRequest::TetherHostFetchRequest(
TetherHostFetcher::TetherHostFetchRequest::~TetherHostFetchRequest() {}
TetherHostFetcher::TetherHostFetcher(
- const std::string& user_id,
- const std::string& user_private_key,
- cryptauth::CryptAuthService* cryptauth_service,
- cryptauth::CryptAuthDeviceManager* device_manager)
- : user_id_(user_id),
- user_private_key_(user_private_key),
- cryptauth_service_(cryptauth_service),
- device_manager_(device_manager),
- weak_ptr_factory_(this) {}
+ cryptauth::CryptAuthService* cryptauth_service)
+ : cryptauth_service_(cryptauth_service), weak_ptr_factory_(this) {}
TetherHostFetcher::~TetherHostFetcher() {}
@@ -64,7 +58,9 @@ void TetherHostFetcher::StartLoadingDevicesIfNeeded() {
}
remote_device_loader_ = cryptauth::RemoteDeviceLoader::Factory::NewInstance(
- device_manager_->GetTetherHosts(), user_id_, user_private_key_,
+ cryptauth_service_->GetCryptAuthDeviceManager()->GetTetherHosts(),
+ cryptauth_service_->GetAccountId(),
+ cryptauth_service_->GetCryptAuthEnrollmentManager()->GetUserPrivateKey(),
cryptauth_service_->CreateSecureMessageDelegate());
remote_device_loader_->Load(
base::Bind(&TetherHostFetcher::OnRemoteDevicesLoaded,
« no previous file with comments | « chromeos/components/tether/tether_host_fetcher.h ('k') | chromeos/components/tether/tether_host_fetcher_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698