BASELINE: Update Chromium to 90.0.4430.221

Change-Id: Iff4d9d18d2fcf1a576f3b1f453010f744a232920
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

1 files changed, 4 insertions, 27 deletions

diff --git a/chromium/components/sync_sessions/session_model_type_controller.cc b/chromium/components/sync_sessions/session_model_type_controller.cc
index 64ae9a53e19..fcf68661433 100644
--- a/chromium/components/sync_sessions/session_model_type_controller.cc
+++ b/chromium/components/sync_sessions/session_model_type_controller.cc
@@ -7,19 +7,10 @@
 #include <utility>
 
 #include "base/bind.h"
-#include "base/feature_list.h"
 #include "components/prefs/pref_service.h"
-#include "components/sync/driver/sync_auth_util.h"
 #include "components/sync/driver/sync_service.h"
-#include "google_apis/gaia/google_service_auth_error.h"
 
 namespace sync_sessions {
-namespace {
-
-const base::Feature kStopSessionsIfSyncPaused{"StopSessionsIfSyncPaused",
-                                              base::FEATURE_ENABLED_BY_DEFAULT};
-
-}  // namespace
 
 SessionModelTypeController::SessionModelTypeController(
     syncer::SyncService* sync_service,
@@ -30,9 +21,6 @@ SessionModelTypeController::SessionModelTypeController(
       sync_service_(sync_service),
       pref_service_(pref_service),
       history_disabled_pref_name_(history_disabled_pref_name) {
-  // TODO(crbug.com/906995): remove this observing mechanism once all sync
-  // datatypes are stopped by ProfileSyncService, when sync is paused.
-  sync_service_->AddObserver(this);
   pref_registrar_.Init(pref_service);
   pref_registrar_.Add(
       history_disabled_pref_name_,
@@ -41,25 +29,14 @@ SessionModelTypeController::SessionModelTypeController(
           base::AsWeakPtr(this)));
 }
 
-SessionModelTypeController::~SessionModelTypeController() {
-  sync_service_->RemoveObserver(this);
-}
+SessionModelTypeController::~SessionModelTypeController() = default;
 
 syncer::DataTypeController::PreconditionState
 SessionModelTypeController::GetPreconditionState() const {
   DCHECK(CalledOnValidThread());
-  bool preconditions_met =
-      !pref_service_->GetBoolean(history_disabled_pref_name_) &&
-      !(syncer::IsWebSignout(sync_service_->GetAuthError()) &&
-        base::FeatureList::IsEnabled(kStopSessionsIfSyncPaused));
-  return preconditions_met ? PreconditionState::kPreconditionsMet
-                           : PreconditionState::kMustStopAndKeepData;
-}
-
-void SessionModelTypeController::OnStateChanged(syncer::SyncService* sync) {
-  DCHECK(CalledOnValidThread());
-  // Most of these calls will be no-ops but SyncService handles that just fine.
-  sync_service_->DataTypePreconditionChanged(type());
+  return pref_service_->GetBoolean(history_disabled_pref_name_)
+             ? PreconditionState::kMustStopAndKeepData
+             : PreconditionState::kPreconditionsMet;
 }
 
 void SessionModelTypeController::OnSavingBrowserHistoryPrefChanged() {