Avoid monitoring the browser active state in account consistency service.

AccountConsistencyService now uses the cookie manager directly to add
or delete the CHROME_CONNECTED cookies for google web domains (this
change landed in CL
https://chromium-review.googlesource.com/c/chromium/src/+/2323901 ).

This means that it can update the CHROME_CONNECTED cookies even when
the incognito mode is active as it no longer relies on using a WKWebView
to inject the CHROME_CONNECTED cookies.

Bug: 1102794

Change-Id: I2064ca62f801f46c0d2dae9b87276f1f6dc9bceb
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2339656
Commit-Queue: Mihai Sardarescu <msarda@chromium.org>
Reviewed-by: Eugene But <eugenebut@chromium.org>
Reviewed-by: Nohemi Fernandez <fernandex@chromium.org>
Cr-Commit-Position: refs/heads/master@{#796322}

components/signin/ios/browser/account_consistency_service.h

@@ -15,7 +15,6 @@
 #include "base/memory/ref_counted.h"
 #include "base/time/time.h"
 #include "components/keyed_service/core/keyed_service.h"
-#include "components/signin/ios/browser/active_state_manager.h"
 #import "components/signin/ios/browser/manage_accounts_delegate.h"
 #import "components/signin/public/identity_manager/identity_manager.h"
 #include "net/cookies/canonical_cookie.h"
@@ -40,8 +39,7 @@ class PrefService;
 // CHROME_CONNECTED, which informs Gaia that the user is signed in to Chrome
 // with Account Consistency on.
 class AccountConsistencyService : public KeyedService,
-                                  public signin::IdentityManager::Observer,
-                                  public ActiveStateManager::Observer {
+                                  public signin::IdentityManager::Observer {
  public:
   // Name of the cookie that is managed by AccountConsistencyService and is used
   // to inform Google web properties that the browser is connected and that
@@ -177,9 +175,6 @@ class AccountConsistencyService : public KeyedService,
       const signin::AccountsInCookieJarInfo& accounts_in_cookie_jar_info,
       const GoogleServiceAuthError& error) override;
 
-  // ActiveStateManager::Observer implementation.
-  void OnActive() override;
-
   // Browser state associated with the service.
   web::BrowserState* browser_state_;
   // Used to update kDomainsWithCookiePref.

components/signin/ios/browser/account_consistency_service.mm

@@ -209,7 +209,6 @@ AccountConsistencyService::AccountConsistencyService(
       identity_manager_(identity_manager),
       applying_cookie_requests_(false) {
   identity_manager_->AddObserver(this);
-  ActiveStateManager::FromBrowserState(browser_state_)->AddObserver(this);
   LoadFromPrefs();
   if (identity_manager_->HasPrimaryAccount()) {
     AddChromeConnectedCookies();
@@ -348,7 +347,6 @@ void AccountConsistencyService::LoadFromPrefs() {
 
 void AccountConsistencyService::Shutdown() {
   identity_manager_->RemoveObserver(this);
-  ActiveStateManager::FromBrowserState(browser_state_)->RemoveObserver(this);
   web_state_handlers_.clear();
 }
 
@@ -361,11 +359,6 @@ void AccountConsistencyService::ApplyCookieRequests() {
   if (cookie_requests_.empty()) {
     return;
   }
-  if (!ActiveStateManager::FromBrowserState(browser_state_)->IsActive()) {
-    // Web view usage isn't active for now, ignore cookie requests for now and
-    // wait to be notified that it became active again.
-    return;
-  }
   applying_cookie_requests_ = true;
 
   const GURL url("https://" + cookie_requests_.front().domain);
@@ -498,9 +491,3 @@ void AccountConsistencyService::OnAccountsInCookieUpdated(
     const GoogleServiceAuthError& error) {
   AddChromeConnectedCookies();
 }
-
-void AccountConsistencyService::OnActive() {
-  // |browser_state_| is now active. There might be some pending cookie requests
-  // to apply.
-  ApplyCookieRequests();
-}

components/signin/ios/browser/account_consistency_service_unittest.mm

@@ -162,7 +162,6 @@ class AccountConsistencyServiceTest : public PlatformTest {
  protected:
   void SetUp() override {
     PlatformTest::SetUp();
-    ActiveStateManager::FromBrowserState(&browser_state_)->SetActive(true);
     AccountConsistencyService::RegisterPrefs(prefs_.registry());
     content_settings::CookieSettings::RegisterProfilePrefs(prefs_.registry());
     HostContentSettingsMap::RegisterProfilePrefs(prefs_.registry());
@@ -186,7 +185,6 @@ class AccountConsistencyServiceTest : public PlatformTest {
   void TearDown() override {
     account_consistency_service_->Shutdown();
     settings_map_->ShutdownOnUIThread();
-    ActiveStateManager::FromBrowserState(&browser_state_)->SetActive(false);
     identity_test_env_.reset();
     PlatformTest::TearDown();
   }
@@ -204,9 +202,7 @@ class AccountConsistencyServiceTest : public PlatformTest {
     // Spinning the runloop is needed to ensure that the cookie manager requests
     // are executed.
     base::RunLoop().RunUntilIdle();
-
-    if (ActiveStateManager::FromBrowserState(&browser_state_)->IsActive())
-      EXPECT_TRUE(account_consistency_service_->cookie_requests_.empty());
+    EXPECT_TRUE(account_consistency_service_->cookie_requests_.empty());
   }
 
   void SignIn() {
@@ -369,20 +365,6 @@ TEST_F(AccountConsistencyServiceTest, SignOutWithoutDomains) {
   CheckNoChromeConnectedCookies();
 }
 
-// Tests that pending cookie requests are correctly applied when the browser
-// state becomes active.
-TEST_F(AccountConsistencyServiceTest, ApplyOnActive) {
-  // No request is made until the browser state is active, then a WKWebView and
-  // its navigation delegate are created, and the requests are processed.
-  ActiveStateManager::FromBrowserState(&browser_state_)->SetActive(false);
-  SignIn();
-  CheckNoChromeConnectedCookies();
-
-  ActiveStateManager::FromBrowserState(&browser_state_)->SetActive(true);
-  CheckDomainHasChromeConnectedCookie(kGoogleDomain);
-  CheckDomainHasChromeConnectedCookie(kYoutubeDomain);
-}
-
 // Tests that the X-Chrome-Manage-Accounts header is ignored unless it comes
 // from Gaia signon realm.
 TEST_F(AccountConsistencyServiceTest, ChromeManageAccountsNotOnGaia) {