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

chrome/browser/local_discovery/cloud_print_base_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/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "base/values.h"
 #include "chrome/browser/local_discovery/cloud_print_base_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/base/url_util.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";
 const char kXSRFURLParameterKey[] = "xsrf";
 const char kUserURLParameterKey[] = "user";
 }
 
 CloudPrintBaseApiFlow::CloudPrintBaseApiFlow(
     net::URLRequestContextGetter* request_context,
     OAuth2TokenService* token_service,
+    const std::string& account_id,
     const GURL& automated_claim_url,
     Delegate* delegate)
     : request_context_(request_context),
       token_service_(token_service),
+      account_id_(account_id),
       user_index_(kAccountIndexUseOAuth2),
       url_(automated_claim_url),
       delegate_(delegate) {
 }
 
 CloudPrintBaseApiFlow::CloudPrintBaseApiFlow(
     net::URLRequestContextGetter* request_context,
     int  user_index,
     const std::string& xsrf_token,
     const GURL& automated_claim_url,
     Delegate* delegate)
     : request_context_(request_context),
       token_service_(NULL),
+      account_id_(""),
       user_index_(user_index),
       xsrf_token_(xsrf_token),
       url_(automated_claim_url),
       delegate_(delegate) {
 }
 
 CloudPrintBaseApiFlow::CloudPrintBaseApiFlow(
     net::URLRequestContextGetter* request_context,
     int  user_index,
     const GURL& automated_claim_url,
     Delegate* delegate)
     : request_context_(request_context),
       token_service_(NULL),
+      account_id_(""),
       user_index_(user_index),
       url_(automated_claim_url),
       delegate_(delegate) {
 }
 
 CloudPrintBaseApiFlow::~CloudPrintBaseApiFlow() {
 }
 
 void CloudPrintBaseApiFlow::Start() {
   if (UseOAuth2()) {
     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);
   } else {
     GURL cookie_url = url_;
 
     if (!xsrf_token_.empty()) {
       cookie_url = net::AppendQueryParameter(cookie_url,
                                              kXSRFURLParameterKey,
                                              xsrf_token_);
     }
 
     cookie_url = net::AppendQueryParameter(cookie_url,
@@ skipping 65 matching lines @@
 
   if (!value || !value->GetAsDictionary(&dictionary_value)) {
     delegate_->OnCloudPrintAPIFlowError(this, ERROR_MALFORMED_RESPONSE);
     return;
   }
 
   delegate_->OnCloudPrintAPIFlowComplete(this, dictionary_value);
 }
 
 }  // namespace local_discovery