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

Unified Diff: chrome/browser/chromeos/login/enrollment/enterprise_enrollment_helper_impl.cc

Issue 1109133004: Cleanup PolicyOAuth2TokenFetcher method signatures. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@policy
Patch Set: Add safety DCHECKs Created 5 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: chrome/browser/chromeos/login/enrollment/enterprise_enrollment_helper_impl.cc
diff --git a/chrome/browser/chromeos/login/enrollment/enterprise_enrollment_helper_impl.cc b/chrome/browser/chromeos/login/enrollment/enterprise_enrollment_helper_impl.cc
index 9cdf43e4c46e9433c7f7d9ab286cfa72ace6d88e..4640bbb8af7611e87220bf1f654b62055ff4e739 100644
--- a/chrome/browser/chromeos/login/enrollment/enterprise_enrollment_helper_impl.cc
+++ b/chrome/browser/chromeos/login/enrollment/enterprise_enrollment_helper_impl.cc
@@ -98,13 +98,12 @@ void EnterpriseEnrollmentHelperImpl::EnrollUsingProfile(
fetch_additional_token_ = fetch_additional_token;
oauth_fetchers_.resize(fetch_additional_token_ ? 2 : 1);
for (size_t i = 0; i < oauth_fetchers_.size(); ++i) {
- oauth_fetchers_[i] = new policy::PolicyOAuth2TokenFetcher(
+ oauth_fetchers_[i] = new policy::PolicyOAuth2TokenFetcher();
+ oauth_fetchers_[i]->StartWithSigninContext(
profile_->GetRequestContext(),
g_browser_process->system_request_context(),
base::Bind(&EnterpriseEnrollmentHelperImpl::OnTokenFetched,
- weak_ptr_factory_.GetWeakPtr(),
- i));
- oauth_fetchers_[i]->Start();
+ weak_ptr_factory_.GetWeakPtr(), i));
}
}
@@ -112,11 +111,11 @@ void EnterpriseEnrollmentHelperImpl::EnrollUsingAuthCode(
const std::string& auth_code) {
DCHECK(!started_);
started_ = true;
- oauth_fetchers_.push_back(new policy::PolicyOAuth2TokenFetcher(
+ oauth_fetchers_.push_back(new policy::PolicyOAuth2TokenFetcher());
+ oauth_fetchers_[0]->StartWithAuthCode(
auth_code, g_browser_process->system_request_context(),
base::Bind(&EnterpriseEnrollmentHelperImpl::OnTokenFetched,
- weak_ptr_factory_.GetWeakPtr(), 0)));
- oauth_fetchers_[0]->Start();
+ weak_ptr_factory_.GetWeakPtr(), 0));
}
void EnterpriseEnrollmentHelperImpl::EnrollUsingToken(

Powered by Google App Engine
This is Rietveld 408576698