[signin] Remove OnStartBatchChanges

As this observer method has no production listeners, it is simply dead code.

Bug: 922406
Change-Id: I9aa23327aed829111ca03ba3013840fdac5542d7
Reviewed-on: https://chromium-review.googlesource.com/c/1452443
Commit-Queue: David Roger <droger@chromium.org>
Auto-Submit: David Roger <droger@chromium.org>
Reviewed-by: Xiyuan Xia <xiyuan@chromium.org>
Reviewed-by: Colin Blundell <blundell@chromium.org>
Cr-Commit-Position: refs/heads/master@{#629923}

chrome/browser/chromeos/oauth2_token_service_delegate.cc

@@ -237,10 +237,9 @@ void ChromeOSOAuth2TokenServiceDelegate::GetAccountsCallback(
   set_load_credentials_state(LOAD_CREDENTIALS_FINISHED_WITH_SUCCESS);
 
   // The typical order of |OAuth2TokenService::Observer| callbacks is:
-  // 1. OnStartBatchChanges
-  // 2. OnRefreshTokenAvailable
-  // 3. OnEndBatchChanges
-  // 4. OnRefreshTokensLoaded
+  // 1. OnRefreshTokenAvailable
+  // 2. OnEndBatchChanges
+  // 3. OnRefreshTokensLoaded
   {
     ScopedBatchChange batch(this);
     for (const auto& account_key : account_keys) {

chrome/browser/chromeos/oauth2_token_service_delegate_unittest.cc

@@ -69,7 +69,7 @@ class TokenServiceObserver : public OAuth2TokenService::Observer {
 
   ~TokenServiceObserver() override { delegate_->RemoveObserver(this); }
 
-  void OnStartBatchChanges() override {
+  void StartBatchChanges() {
     EXPECT_FALSE(is_inside_batch_);
     is_inside_batch_ = true;
 
@@ -83,7 +83,9 @@ class TokenServiceObserver : public OAuth2TokenService::Observer {
   }
 
   void OnRefreshTokenAvailable(const std::string& account_id) override {
-    EXPECT_TRUE(is_inside_batch_);
+    if (!is_inside_batch_)
+      StartBatchChanges();
+
     // We should not be seeing any cached errors for a freshly updated account,
     // except when they have been generated by us (i.e.
     // CREDENTIALS_REJECTED_BY_CLIENT).
@@ -102,9 +104,10 @@ class TokenServiceObserver : public OAuth2TokenService::Observer {
   }
 
   void OnRefreshTokenRevoked(const std::string& account_id) override {
-    EXPECT_TRUE(is_inside_batch_);
-    account_ids_.erase(account_id);
+    if (!is_inside_batch_)
+      StartBatchChanges();
 
+    account_ids_.erase(account_id);
     // Record the |account_id| in the last batch.
     batch_change_records_.rbegin()->emplace_back(account_id);
   }

google_apis/gaia/oauth2_token_service.h

@@ -112,8 +112,6 @@ class OAuth2TokenService {
     // Called after all refresh tokens are loaded during OAuth2TokenService
     // startup.
     virtual void OnRefreshTokensLoaded() {}
-    // Sent before starting a batch of refresh token changes.
-    virtual void OnStartBatchChanges() {}
     // Sent after a batch of refresh token changes is done.
     virtual void OnEndBatchChanges() {}
     // Called when the authentication error state for |account_id| has changed.

google_apis/gaia/oauth2_token_service_delegate.cc

@@ -58,10 +58,6 @@ void OAuth2TokenServiceDelegate::RemoveObserver(
 
 void OAuth2TokenServiceDelegate::StartBatchChanges() {
   ++batch_change_depth_;
-  if (batch_change_depth_ == 1) {
-    for (auto& observer : observer_list_)
-      observer.OnStartBatchChanges();
-  }
 }
 
 void OAuth2TokenServiceDelegate::EndBatchChanges() {

services/identity/public/cpp/identity_manager.cc

@@ -394,11 +394,6 @@ void IdentityManager::OnRefreshTokensLoaded() {
     observer.OnRefreshTokensLoaded();
 }
 
-void IdentityManager::OnStartBatchChanges() {
-  for (auto& observer : observer_list_)
-    observer.OnStartBatchOfRefreshTokenStateChanges();
-}
-
 void IdentityManager::OnEndBatchChanges() {
   for (auto& observer : observer_list_)
     observer.OnEndBatchOfRefreshTokenStateChanges();

services/identity/public/cpp/identity_manager.h

@@ -152,9 +152,6 @@ class IdentityManager : public SigninManagerBase::Observer,
     // action, e.g. from the settings or by an extension.
     virtual void OnAccountsCookieDeletedByUserAction() {}
 
-    // Called before a batch of refresh token state changes is started.
-    virtual void OnStartBatchOfRefreshTokenStateChanges() {}
-
     // Called after a batch of refresh token state chagnes is completed.
     virtual void OnEndBatchOfRefreshTokenStateChanges() {}
 
@@ -471,7 +468,6 @@ class IdentityManager : public SigninManagerBase::Observer,
   void OnRefreshTokenAvailable(const std::string& account_id) override;
   void OnRefreshTokenRevoked(const std::string& account_id) override;
   void OnRefreshTokensLoaded() override;
-  void OnStartBatchChanges() override;
   void OnEndBatchChanges() override;
   void OnAuthErrorChanged(const std::string& account_id,
                           const GoogleServiceAuthError& auth_error) override;

services/identity/public/cpp/identity_manager_unittest.cc

@@ -366,14 +366,18 @@ class TestIdentityManagerObserver : IdentityManager::Observer {
   }
   void OnRefreshTokenUpdatedForAccount(
       const AccountInfo& account_info) override {
-    EXPECT_TRUE(is_inside_batch_);
+    if (!is_inside_batch_)
+      StartBatchOfRefreshTokenStateChanges();
+
     batch_change_records_.rbegin()->emplace_back(account_info.account_id);
     account_from_refresh_token_updated_callback_ = account_info;
     if (on_refresh_token_updated_callback_)
       std::move(on_refresh_token_updated_callback_).Run();
   }
   void OnRefreshTokenRemovedForAccount(const std::string& account_id) override {
-    EXPECT_TRUE(is_inside_batch_);
+    if (!is_inside_batch_)
+      StartBatchOfRefreshTokenStateChanges();
+
     batch_change_records_.rbegin()->emplace_back(account_id);
     account_from_refresh_token_removed_callback_ = account_id;
     if (on_refresh_token_removed_callback_)
@@ -412,7 +416,7 @@ class TestIdentityManagerObserver : IdentityManager::Observer {
     std::move(on_cookie_deleted_by_user_callback_).Run();
   }
 
-  void OnStartBatchOfRefreshTokenStateChanges() override {
+  void StartBatchOfRefreshTokenStateChanges() {
     EXPECT_FALSE(is_inside_batch_);
     is_inside_batch_ = true;
 

services/identity/public/objc/identity_manager_observer_bridge.h

@@ -31,7 +31,6 @@
 - (void)onAccountsInCookieUpdated:
             (const identity::AccountsInCookieJarInfo&)accountsInCookieJarInfo
                             error:(const GoogleServiceAuthError&)error;
-- (void)onStartBatchOfRefreshTokenStateChanges;
 - (void)onEndBatchOfRefreshTokenStateChanges;
 
 @end
@@ -60,7 +59,6 @@ class IdentityManagerObserverBridge : public IdentityManager::Observer {
   void OnAccountsInCookieUpdated(
       const identity::AccountsInCookieJarInfo& accounts_in_cookie_jar_info,
       const GoogleServiceAuthError& error) override;
-  void OnStartBatchOfRefreshTokenStateChanges() override;
   void OnEndBatchOfRefreshTokenStateChanges() override;
 
  private:

services/identity/public/objc/identity_manager_observer_bridge.mm

@@ -74,13 +74,6 @@ void IdentityManagerObserverBridge::OnAccountsInCookieUpdated(
   }
 }
 
-void IdentityManagerObserverBridge::OnStartBatchOfRefreshTokenStateChanges() {
-  if ([delegate_ respondsToSelector:@selector
-                 (onStartBatchOfRefreshTokenStateChanges)]) {
-    [delegate_ onStartBatchOfRefreshTokenStateChanges];
-  }
-}
-
 void IdentityManagerObserverBridge::OnEndBatchOfRefreshTokenStateChanges() {
   if ([delegate_
           respondsToSelector:@selector(onEndBatchOfRefreshTokenStateChanges)]) {