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

chrome/browser/local_discovery/privet_confirm_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_PRIVET_CONFIRM_API_FLOW_H_
 #define CHROME_BROWSER_LOCAL_DISCOVERY_PRIVET_CONFIRM_API_FLOW_H_
 
 #include <string>
 
 #include "chrome/browser/local_discovery/privet_http.h"
@@ skipping 14 matching lines @@
     ERROR_TOKEN,
     ERROR_NETWORK,
     ERROR_HTTP_CODE,
     ERROR_FROM_SERVER,
     ERROR_MALFORMED_RESPONSE
   };
   typedef base::Callback<void(Status /*success*/)> ResponseCallback;
 
   PrivetConfirmApiCallFlow(net::URLRequestContextGetter* request_context,
                            OAuth2TokenService* token_service_,
+                           const std::string& account_id,
                            const GURL& automated_claim_url,
                            const ResponseCallback& callback);
   virtual ~PrivetConfirmApiCallFlow();
 
   void Start();
 
   // net::URLFetcherDelegate implementation:
   virtual void OnURLFetchComplete(const net::URLFetcher* source) OVERRIDE;
 
   // OAuth2TokenService::Consumer implementation:
   virtual void OnGetTokenSuccess(const OAuth2TokenService::Request* request,
                                  const std::string& access_token,
                                  const base::Time& expiration_time) OVERRIDE;
   virtual void OnGetTokenFailure(const OAuth2TokenService::Request* request,
                                  const GoogleServiceAuthError& error) OVERRIDE;
 
  private:
   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_;
   GURL automated_claim_url_;
   ResponseCallback callback_;
 };
 
 }  // namespace local_discovery
 
 #endif  // CHROME_BROWSER_LOCAL_DISCOVERY_PRIVET_CONFIRM_API_FLOW_H_