Clean up sharing feature flags:
kSharingSendViaSync, kSharingPreferVapid and kSharingMessageBridgeTimeoutSeconds.
Bug: 1404664
Change-Id: I8d01974eddb2db7b5bd6449d3ea5c20942996972
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4173998
Commit-Queue: Jens Mueller <[email protected]>
Reviewed-by: Marc Treib <[email protected]>
Reviewed-by: Rushan Suleymanov <[email protected]>
Auto-Submit: Jens Mueller <[email protected]>
Cr-Commit-Position: refs/heads/main@{#1094533}
diff --git a/chrome/browser/sharing/sharing_utils_unittest.cc b/chrome/browser/sharing/sharing_utils_unittest.cc
index 5773458..b1bfa64 100644
--- a/chrome/browser/sharing/sharing_utils_unittest.cc
+++ b/chrome/browser/sharing/sharing_utils_unittest.cc
@@ -31,17 +31,12 @@
SharingUtilsTest() = default;
protected:
- base::test::ScopedFeatureList scoped_feature_list_;
syncer::TestSyncService test_sync_service_;
};
} // namespace
TEST_F(SharingUtilsTest, SyncEnabled_FullySynced) {
- // Disable transport mode required features.
- scoped_feature_list_.InitWithFeatures(
- /*enabled_features=*/{},
- /*disabled_features=*/{kSharingSendViaSync});
test_sync_service_.SetTransportState(
syncer::SyncService::TransportState::ACTIVE);
// PREFERENCES is actively synced.
@@ -55,26 +50,20 @@
}
TEST_F(SharingUtilsTest, SyncDisabled_FullySynced_MissingDataTypes) {
- // Disable transport mode required features.
- scoped_feature_list_.InitWithFeatures(
- /*enabled_features=*/{},
- /*disabled_features=*/{kSharingSendViaSync});
test_sync_service_.SetTransportState(
syncer::SyncService::TransportState::ACTIVE);
// Missing PREFERENCES.
test_sync_service_.GetUserSettings()->SetSelectedTypes(
/*sync_everything=*/false,
/*types=*/syncer::UserSelectableTypeSet());
+ // Not able to sync SHARING_MESSAGE.
+ test_sync_service_.SetFailedDataTypes({syncer::SHARING_MESSAGE});
EXPECT_FALSE(IsSyncEnabledForSharing(&test_sync_service_));
EXPECT_TRUE(IsSyncDisabledForSharing(&test_sync_service_));
}
TEST_F(SharingUtilsTest, SyncEnabled_SigninOnly) {
- // Enable transport mode required features.
- scoped_feature_list_.InitWithFeatures(
- /*enabled_features=*/{kSharingSendViaSync},
- /*disabled_features=*/{});
test_sync_service_.SetTransportState(
syncer::SyncService::TransportState::ACTIVE);
// SHARING_MESSAGE is actively synced.
@@ -83,10 +72,6 @@
}
TEST_F(SharingUtilsTest, SyncDisabled_SigninOnly_MissingDataTypes) {
- // Enable transport mode required features.
- scoped_feature_list_.InitWithFeatures(
- /*enabled_features=*/{kSharingSendViaSync},
- /*disabled_features=*/{});
test_sync_service_.SetTransportState(
syncer::SyncService::TransportState::ACTIVE);
// Missing SHARING_MESSAGE.