Merge from Chromium at DEPS revision 267519

This commit was generated by merge_to_master.py.

Change-Id: I6002987b71e09742c68bad9c834ae800ff531f25

1 files changed, 12 insertions, 3 deletions

diff --git a/chrome/browser/signin/android_profile_oauth2_token_service.h b/chrome/browser/signin/android_profile_oauth2_token_service.h
index a641e3e682..d1de5a6f84 100644
--- a/chrome/browser/signin/android_profile_oauth2_token_service.h
+++ b/chrome/browser/signin/android_profile_oauth2_token_service.h
@@ -42,15 +42,20 @@ class AndroidProfileOAuth2TokenService : public ProfileOAuth2TokenService {
   // Lists account IDs of all accounts with a refresh token.
   virtual std::vector<std::string> GetAccounts() OVERRIDE;
 
+  // Lists account at the OS level.
+  std::vector<std::string> GetSystemAccounts();
+
   void ValidateAccounts(JNIEnv* env,
                         jobject obj,
-                        jobjectArray accounts,
                         jstring current_account);
 
   // Takes a the signed in sync account as well as all the other
   // android account ids and check the token status of each.
-  void ValidateAccounts(const std::string& signed_in_account,
-                        const std::vector<std::string>& account_ids);
+  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
@@ -67,6 +72,10 @@ class AndroidProfileOAuth2TokenService : public ProfileOAuth2TokenService {
   // refresh tokens have now been loaded.
   virtual void FireRefreshTokensLoadedFromJava(JNIEnv* env, jobject obj);
 
+  // Overridden from OAuth2TokenService to complete signout of all
+  // OA2TService aware accounts.
+  virtual void RevokeAllCredentials() OVERRIDE;
+
  protected:
   friend class ProfileOAuth2TokenServiceFactory;
   AndroidProfileOAuth2TokenService();