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

chrome/browser/local_discovery/privet_confirm_api_flow.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/json/json_reader.h"
 #include "base/strings/stringprintf.h"
 #include "base/values.h"
 #include "chrome/browser/local_discovery/privet_confirm_api_flow.h"
 #include "chrome/common/cloud_print/cloud_print_constants.h"
 #include "google_apis/gaia/google_service_auth_error.h"
 #include "net/base/load_flags.h"
 #include "net/http/http_status_code.h"
 #include "net/url_request/url_request_status.h"
 
 namespace local_discovery {
 
 namespace {
 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) {
 }
 
 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(
     const OAuth2TokenService::Request* request,
     const std::string& access_token,
     const base::Time& expiration_time) {
   url_fetcher_.reset(net::URLFetcher::Create(automated_claim_url_,
                                              net::URLFetcher::GET,
                                              this));
   url_fetcher_->SetRequestContext(request_context_.get());
@@ skipping 45 matching lines @@
   }
 
   if (success) {
     callback_.Run(SUCCESS);
   } else {
     callback_.Run(ERROR_FROM_SERVER);
   }
 }
 
 }  // namespace local_discovery