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

chrome/browser/chromeos/settings/device_oauth2_token_service.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_CHROMEOS_SETTINGS_DEVICE_OAUTH2_TOKEN_SERVICE_H_
 #define CHROME_BROWSER_CHROMEOS_SETTINGS_DEVICE_OAUTH2_TOKEN_SERVICE_H_
 
 #include <set>
 #include <string>
 
@@ skipping 16 matching lines @@
 class Profile;
 
 namespace chromeos {
 
 // DeviceOAuth2TokenService retrieves OAuth2 access tokens for a given
 // set of scopes using the device-level OAuth2 any-api refresh token
 // obtained during enterprise device enrollment.
 //
 // See |OAuth2TokenService| for usage details.
 //
+// When using DeviceOAuth2TokenSerivce, a value of |GetDeviceAccountId| should
+// be used in places where API expects |account_id|.
+//
 // Note that requests must be made from the UI thread.
 class DeviceOAuth2TokenService : public OAuth2TokenService {
  public:
   // Specialization of StartRequest that in parallel validates that the refresh
   // token stored on the device is owned by the device service account.
-  virtual scoped_ptr<Request> StartRequest(const ScopeSet& scopes,
+  // TODO(fgorski): Remove override of StartRequest to make the method
+  // non-virtual. See crbug.com/282454 for details.
+  virtual scoped_ptr<Request> StartRequest(const std::string& account_id,
+                                           const ScopeSet& scopes,
                                            Consumer* consumer) OVERRIDE;
 
   // Persist the given refresh token on the device.  Overwrites any previous
   // value.  Should only be called during initial device setup.
   void SetAndSaveRefreshToken(const std::string& refresh_token);
 
   static void RegisterPrefs(PrefRegistrySimple* registry);
 
-  virtual std::string GetRefreshToken() OVERRIDE;
+  // Gets the refresh token used by the service. |account_id| is expected to be
+  // a value of |GetDeviceAccountId|.
+  virtual std::string GetRefreshToken(const std::string& account_id) OVERRIDE;
+
+  // Gets the device account id for use with |StartRequest| and
+  // |IsRefreshTokenAvailable| methods.
+  const std::string& GetDeviceAccountId() const;
 
  protected:
   // Pull the robot account ID from device policy.
   virtual std::string GetRobotAccountId();
 
   // Implementation of OAuth2TokenService.
   virtual net::URLRequestContextGetter* GetRequestContext() OVERRIDE;
 
  private:
   class ValidatingConsumer;
@@ skipping 10 matching lines @@
   void OnValidationComplete(bool token_is_valid);
 
   bool refresh_token_is_valid_;
   int max_refresh_token_validation_retries_;
 
   scoped_refptr<net::URLRequestContextGetter> url_request_context_getter_;
 
   // Cache the decrypted refresh token, so we only decrypt once.
   std::string refresh_token_;
   PrefService* local_state_;
+  std::string device_account_id_;
   DISALLOW_COPY_AND_ASSIGN(DeviceOAuth2TokenService);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_SETTINGS_DEVICE_OAUTH2_TOKEN_SERVICE_H_