Convert UserPolicySigninService to use OAuth2TokenService

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 ca6f41e727d713d453d524d868ba979fd87fbefd..24f852911b867798e8d77fa0280b29c691a5f44b 100644
--- a/chrome/browser/chromeos/settings/device_oauth2_token_service.h
+++ b/chrome/browser/chromeos/settings/device_oauth2_token_service.h
@@ -54,6 +54,9 @@ class DeviceOAuth2TokenService : public OAuth2TokenService {
   // Pull the robot account ID from device policy.
   virtual std::string GetRobotAccountId();
 
+  // Implementation of OAuth2TokenService.
+  virtual net::URLRequestContextGetter* GetRequestContext() OVERRIDE;

[Mattias Nissler (ping if slow), 2013/08/20 16:00:28]

This probably also requires definition order adjustments in the .cc file (I
thought we had consistent ordering as a general rule?)

+
  private:
   class ValidatingConsumer;
   friend class ValidatingConsumer;
@@ -66,9 +69,6 @@ class DeviceOAuth2TokenService : public OAuth2TokenService {
                                     PrefService* local_state);
   virtual ~DeviceOAuth2TokenService();
 
-  // Implementation of OAuth2TokenService.
-  virtual net::URLRequestContextGetter* GetRequestContext() OVERRIDE;
-
   void OnValidationComplete(bool token_is_valid);
 
   bool refresh_token_is_valid_;