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 21 matching lines @@
 // set of scopes using the device-level OAuth2 any-api refresh token
 // obtained during enterprise device enrollment.
 //
 // See |OAuth2TokenService| for usage details.
 //
 // 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,
+  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
   // 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;
+  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.
   virtual std::string GetRobotAccountId();
 
   // Implementation of OAuth2TokenService.
   virtual net::URLRequestContextGetter* GetRequestContext() OVERRIDE;
 
  private:
   class ValidatingConsumer;
@@ skipping 16 matching lines @@
 
   // Cache the decrypted refresh token, so we only decrypt once.
   std::string refresh_token_;
   PrefService* local_state_;
   DISALLOW_COPY_AND_ASSIGN(DeviceOAuth2TokenService);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_SETTINGS_DEVICE_OAUTH2_TOKEN_SERVICE_H_