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

chrome/browser/local_discovery/cloud_print_base_api_flow.h

 // 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.
 
 #ifndef CHROME_BROWSER_LOCAL_DISCOVERY_CLOUD_PRINT_BASE_API_FLOW_H_
 #define CHROME_BROWSER_LOCAL_DISCOVERY_CLOUD_PRINT_BASE_API_FLOW_H_
 
 #include <string>
 
 #include "chrome/browser/local_discovery/privet_constants.h"
@@ skipping 26 matching lines @@
     virtual void OnCloudPrintAPIFlowError(CloudPrintBaseApiFlow* flow,
                                           Status status) = 0;
     virtual void OnCloudPrintAPIFlowComplete(
         CloudPrintBaseApiFlow* flow,
         const base::DictionaryValue* value) = 0;
   };
 
   // Create an OAuth2-based confirmation.
   CloudPrintBaseApiFlow(net::URLRequestContextGetter* request_context,
                         OAuth2TokenService* token_service_,
+                        const std::string& account_id,
                         const GURL& automated_claim_url,
                         Delegate* delegate);
 
   // Create a cookie-based confirmation.
   CloudPrintBaseApiFlow(net::URLRequestContextGetter* request_context,
                         int  user_index,
                         const std::string& xsrf_token,
                         const GURL& automated_claim_url,
                         Delegate* delegate);
 
@@ skipping 25 matching lines @@
 
  private:
   bool UseOAuth2() { return user_index_ == kAccountIndexUseOAuth2; }
 
   void CreateRequest(const GURL& url);
 
   scoped_ptr<net::URLFetcher> url_fetcher_;
   scoped_ptr<OAuth2TokenService::Request> oauth_request_;
   scoped_refptr<net::URLRequestContextGetter> request_context_;
   OAuth2TokenService* token_service_;
+  std::string account_id_;
   int user_index_;
   std::string xsrf_token_;
   GURL url_;
   Delegate* delegate_;
 };
 
 }  // namespace local_discovery
 
 #endif  // CHROME_BROWSER_LOCAL_DISCOVERY_CLOUD_PRINT_BASE_API_FLOW_H_