Commit 235a053e authored by Jan Krcal's avatar Jan Krcal Committed by Commit Bot

[Sync] Remove kSyncPreventCommitsBypassingNudgeDelay switch

This CL cleans-up a kill switch for code successfully launched in M81.

Bug: 1022293
Change-Id: If05412a2e700fdc8132f36c00b6b0a92d42281c5
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2215803
Commit-Queue: Jan Krcal <jkrcal@chromium.org>
Auto-Submit: Jan Krcal <jkrcal@chromium.org>
Reviewed-by: default avatarMaksim Moskvitin <mmoskvitin@google.com>
Cr-Commit-Position: refs/heads/master@{#771765}
parent 290dd0f0
...@@ -20,11 +20,4 @@ const base::Feature kSyncUseScryptForNewCustomPassphrases{ ...@@ -20,11 +20,4 @@ const base::Feature kSyncUseScryptForNewCustomPassphrases{
const base::Feature kSyncSupportTrustedVaultPassphrase{ const base::Feature kSyncSupportTrustedVaultPassphrase{
"SyncSupportTrustedVaultPassphrase", base::FEATURE_ENABLED_BY_DEFAULT}; "SyncSupportTrustedVaultPassphrase", base::FEATURE_ENABLED_BY_DEFAULT};
// If enabled sync cycle ends by collecting contributions from all datatypes
// and having less than max_commit_batch_size() entries to commit. If disabled
// it ends when attempt to collect contributions returned no entries to commit.
// TODO(crbug.com/1022293): Remove this flag after M82 or so.
const base::Feature kSyncPreventCommitsBypassingNudgeDelay{
"SyncPreventCommitsBypassingNudgeDelay", base::FEATURE_ENABLED_BY_DEFAULT};
} // namespace switches } // namespace switches
...@@ -12,7 +12,6 @@ namespace switches { ...@@ -12,7 +12,6 @@ namespace switches {
extern const base::Feature kSyncResetPollIntervalOnStart; extern const base::Feature kSyncResetPollIntervalOnStart;
extern const base::Feature kSyncUseScryptForNewCustomPassphrases; extern const base::Feature kSyncUseScryptForNewCustomPassphrases;
extern const base::Feature kSyncSupportTrustedVaultPassphrase; extern const base::Feature kSyncSupportTrustedVaultPassphrase;
extern const base::Feature kSyncPreventCommitsBypassingNudgeDelay;
} // namespace switches } // namespace switches
......
...@@ -8,7 +8,6 @@ ...@@ -8,7 +8,6 @@
#include <utility> #include <utility>
#include "base/metrics/histogram_macros.h" #include "base/metrics/histogram_macros.h"
#include "components/sync/engine/sync_engine_switches.h"
#include "components/sync/engine_impl/commit_contribution.h" #include "components/sync/engine_impl/commit_contribution.h"
#include "components/sync/engine_impl/commit_contributor.h" #include "components/sync/engine_impl/commit_contributor.h"
#include "components/sync/protocol/sync.pb.h" #include "components/sync/protocol/sync.pb.h"
...@@ -33,9 +32,7 @@ Commit::ContributionMap CommitProcessor::GatherCommitContributions( ...@@ -33,9 +32,7 @@ Commit::ContributionMap CommitProcessor::GatherCommitContributions(
size_t max_entries, size_t max_entries,
bool cookie_jar_mismatch, bool cookie_jar_mismatch,
bool cookie_jar_empty) { bool cookie_jar_empty) {
if (gathered_all_contributions_ && if (gathered_all_contributions_) {
base::FeatureList::IsEnabled(
switches::kSyncPreventCommitsBypassingNudgeDelay)) {
return Commit::ContributionMap(); return Commit::ContributionMap();
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment