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

chrome/browser/chromeos/settings/device_oauth2_token_service.h

Index: chrome/browser/chromeos/settings/device_oauth2_token_service.h
diff --git a/chrome/browser/chromeos/settings/device_oauth2_token_service.h b/chrome/browser/chromeos/settings/device_oauth2_token_service.h
index 1ce619691a64620465b91751839eee9b684e240b..24a18740088d89d0993b864f67932e6ac1ef61a9 100644
--- a/chrome/browser/chromeos/settings/device_oauth2_token_service.h
+++ b/chrome/browser/chromeos/settings/device_oauth2_token_service.h
@@ -39,7 +39,8 @@ 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,
+  virtual scoped_ptr<Request> StartRequest(const std::string& account_id,

[Andrew T Wilson (Slow), 2013/08/30 10:47:00]

Can you add a TODO and file a bug to not OVERRIDE this? It doesn't make sense to
just override StartRequest() without overriding all the other APIs (like
StartRequestForClient/StartRequestWithContext). I think the right place to
override is FetchOAuth2Token().

[fgorski, 2013/08/30 20:10:16]

Done. crbug.com/282454

+                                           const ScopeSet& scopes,
                                            Consumer* consumer) OVERRIDE;
 
   // Persist the given refresh token on the device.  Overwrites any previous
@@ -48,7 +49,7 @@ class DeviceOAuth2TokenService : public OAuth2TokenService {
 
   static void RegisterPrefs(PrefRegistrySimple* registry);
 
-  virtual std::string GetRefreshToken() OVERRIDE;
+  virtual std::string GetRefreshToken(const std::string& account_id) OVERRIDE;

[Andrew T Wilson (Slow), 2013/08/30 10:47:00]

Document that account_id *must* be empty since we don't support multiple
accounts? Or else, maybe enforce that the account_id passed in matches the
device service account ID?

[fgorski, 2013/08/30 20:10:16]

I went with your comment to introduce GetDeviceAccountId and propagated that
thought in the documentation of the method.

I've also added a comment to the class documentation, that sets the expectation.

 
  protected:
   // Pull the robot account ID from device policy.