Merge from Chromium at DEPS revision 273901

This commit was generated by merge_to_master.py.

Change-Id: I45745444894df927ffc1045ab8de88b9e52636a3

1 files changed, 8 insertions, 4 deletions

diff --git a/chrome/browser/signin/android_profile_oauth2_token_service.h b/chrome/browser/signin/android_profile_oauth2_token_service.h
index d1de5a6f84..4f1cff2f1f 100644
--- a/chrome/browser/signin/android_profile_oauth2_token_service.h
+++ b/chrome/browser/signin/android_profile_oauth2_token_service.h
@@ -53,10 +53,6 @@ class AndroidProfileOAuth2TokenService : public ProfileOAuth2TokenService {
   // android account ids and check the token status of each.
   void ValidateAccounts(const std::string& signed_in_account);
 
-  bool ValidateAccounts(const std::string& signed_in_account,
-                        const std::vector<std::string>& prev_account_ids,
-                        const std::vector<std::string>& curr_account_ids);
-
   // Triggers a notification to all observers of the OAuth2TokenService that a
   // refresh token is now available. This may cause observers to retry
   // operations that require authentication.
@@ -113,6 +109,14 @@ class AndroidProfileOAuth2TokenService : public ProfileOAuth2TokenService {
   // Called to notify observers when refresh tokans have been loaded.
   virtual void FireRefreshTokensLoaded() OVERRIDE;
 
+  // Return whether |signed_in_account| is valid and we have access
+  // to all the tokens in |curr_account_ids|.
+  bool ValidateAccounts(const std::string& signed_in_account,
+                        const std::vector<std::string>& prev_account_ids,
+                        const std::vector<std::string>& curr_account_ids,
+                        std::vector<std::string>& refreshed_ids,
+                        std::vector<std::string>& revoked_ids);
+
  private:
   base::android::ScopedJavaGlobalRef<jobject> java_ref_;