Convert UserPolicySigninService to use OAuth2TokenService

chrome/browser/signin/profile_oauth2_token_service.h

Index: chrome/browser/signin/profile_oauth2_token_service.h
diff --git a/chrome/browser/signin/profile_oauth2_token_service.h b/chrome/browser/signin/profile_oauth2_token_service.h
index 013cc065963795ba474feb5732ad7d852aee3bf4..a920e5efb8077efd6e818a6173ecb944757e69d1 100644
--- a/chrome/browser/signin/profile_oauth2_token_service.h
+++ b/chrome/browser/signin/profile_oauth2_token_service.h
@@ -58,9 +58,6 @@ class ProfileOAuth2TokenService : public OAuth2TokenService,
   // SigninGlobalError::AuthStatusProvider implementation.
   virtual GoogleServiceAuthError GetAuthStatus() const OVERRIDE;
 
-  // OAuth2TokenService implementation.
-  virtual net::URLRequestContextGetter* GetRequestContext() OVERRIDE;
-
   // Takes injected TokenService for testing.
   bool ShouldCacheForRefreshToken(TokenService *token_service,
                                   const std::string& refresh_token);
@@ -94,6 +91,9 @@ class ProfileOAuth2TokenService : public OAuth2TokenService,
   // OAuth2TokenService overrides.
   virtual std::string GetRefreshToken() OVERRIDE;
 
+  // OAuth2TokenService implementation.
+  virtual net::URLRequestContextGetter* GetRequestContext() OVERRIDE;

[Mattias Nissler (ping if slow), 2013/08/19 14:03:22]

If you change declaration order, you should probably also adjust definition
order in profile_oauth2_token_service.cc

[Andrew T Wilson (Slow), 2013/08/20 09:28:35]

Oh, god, I hadn't realized that someone was actually keeping the .h and .cc
orderings in sync. People do the silliest things.

+
   // Updates the internal cache of the result from the most-recently-completed
   // auth request (used for reporting errors to the user).
   virtual void UpdateAuthError(const GoogleServiceAuthError& error) OVERRIDE;