Making OAuth2TokenService multi-login aware, updating callers, minor fixes

chrome/browser/local_discovery/privet_confirm_api_flow.cc

Index: chrome/browser/local_discovery/privet_confirm_api_flow.cc
diff --git a/chrome/browser/local_discovery/privet_confirm_api_flow.cc b/chrome/browser/local_discovery/privet_confirm_api_flow.cc
index 8f9f6ce430b40e6e4f44f3f882b481cdbe2282cd..0324d258e8739eb414889f3f75451ec7a4fad65a 100644
--- a/chrome/browser/local_discovery/privet_confirm_api_flow.cc
+++ b/chrome/browser/local_discovery/privet_confirm_api_flow.cc
@@ -21,10 +21,12 @@ const char kCloudPrintOAuthHeaderFormat[] = "Authorization: Bearer %s";
 PrivetConfirmApiCallFlow::PrivetConfirmApiCallFlow(
     net::URLRequestContextGetter* request_context,
     OAuth2TokenService* token_service,
+    const std::string& account_id,
     const GURL& automated_claim_url,
     const ResponseCallback& callback)
     : request_context_(request_context),
       token_service_(token_service),
+      account_id_(account_id),
       automated_claim_url_(automated_claim_url),
       callback_(callback) {
 }
@@ -35,7 +37,8 @@ PrivetConfirmApiCallFlow::~PrivetConfirmApiCallFlow() {
 void PrivetConfirmApiCallFlow::Start() {
   OAuth2TokenService::ScopeSet oauth_scopes;
   oauth_scopes.insert(cloud_print::kCloudPrintAuth);
-  oauth_request_ = token_service_->StartRequest(oauth_scopes, this);
+  oauth_request_ = token_service_->StartRequest(account_id_, oauth_scopes,
+      this);
 }
 
 void PrivetConfirmApiCallFlow::OnGetTokenSuccess(