f1ad8d1572606328c67e582d235cd8db8345f851 - chromium/src

[jimmy...@google.com]

commit f1ad8d1572606328c67e582d235cd8db8345f851
Author: Jimmy Gong <jimmy...@google.com>
AuthorDate: Tue Mar 02 21:39:55 2021
Commit: Chromium LUCI CQ <chromiu...@luci-project-accounts.iam.gserviceaccount.com>
CommitDate: Tue Mar 02 21:39:55 2021

pciguard: Remove deprecated flag, DisablePeripheralDataAccessProtection

- This flag is no longer used as we have transitioned to use a
CrosSetting, kDevicePeripheralDataAccessEnabled.

Bug: 1175987
Change-Id: I66540c9a812e45497566562ade6c09dd4c09ac4e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2724974
Reviewed-by: Zentaro Kavanagh <zen...@chromium.org>
Commit-Queue: Jimmy Gong <jimmy...@chromium.org>
Cr-Commit-Position: refs/heads/master@{#859135}

diff --git a/ash/constants/ash_features.cc b/ash/constants/ash_features.cc
index 2e8b452..2677fb3 100644
--- a/ash/constants/ash_features.cc
+++ b/ash/constants/ash_features.cc
@@ -315,9 +315,6 @@
const base::Feature kExoLockNotification{"ExoLockNotification",
base::FEATURE_DISABLED_BY_DEFAULT};

-const base::Feature kDisablePeripheralDataAccessProtection{
- "DisablePeripheralDataAccessProtection", base::FEATURE_DISABLED_BY_DEFAULT};
-
// Enables policy that controls feature to allow Family Link accounts on school
// owned devices.
const base::Feature kFamilyLinkOnSchoolDevice{"FamilyLinkOnSchoolDevice",
@@ -768,10 +765,6 @@
return base::FeatureList::IsEnabled(kEcheSWA);
}

-bool IsPeripheralDataAccessProtectionEnabled() {
- return !base::FeatureList::IsEnabled(kDisablePeripheralDataAccessProtection);
-}
-
bool IsHostnameSettingEnabled() {
return base::FeatureList::IsEnabled(kEnableHostnameSetting);
}
diff --git a/ash/constants/ash_features.h b/ash/constants/ash_features.h
index 816359c4..9c98216 100644
--- a/ash/constants/ash_features.h
+++ b/ash/constants/ash_features.h
@@ -125,8 +125,6 @@
extern const base::Feature kCryptAuthV2Enrollment;
COMPONENT_EXPORT(ASH_CONSTANTS)
extern const base::Feature kDisableOfficeEditingComponentApp;
-COMPONENT_EXPORT(ASH_CONSTANTS)
-extern const base::Feature kDisablePeripheralDataAccessProtection;
COMPONENT_EXPORT(ASH_CONSTANTS) extern const base::Feature kDriveFs;
COMPONENT_EXPORT(ASH_CONSTANTS)
extern const base::Feature kDriveFsBidirectionalNativeMessaging;
@@ -362,7 +360,6 @@
COMPONENT_EXPORT(ASH_CONSTANTS) bool IsOobeChromeVoxHintEnabled();
COMPONENT_EXPORT(ASH_CONSTANTS) bool IsOobeScreensPriorityEnabled();
COMPONENT_EXPORT(ASH_CONSTANTS) bool IsPciguardUiEnabled();
-COMPONENT_EXPORT(ASH_CONSTANTS) bool IsPeripheralDataAccessProtectionEnabled();
COMPONENT_EXPORT(ASH_CONSTANTS) bool IsPhoneHubEnabled();
COMPONENT_EXPORT(ASH_CONSTANTS) bool IsPhoneHubUseBleEnabled();
COMPONENT_EXPORT(ASH_CONSTANTS) bool IsPinAutosubmitBackfillFeatureEnabled();
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index 81e0767..6356b6c 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -5684,12 +5684,6 @@
flag_descriptions::kPrintServerScalingDescription, kOsCrOS,
FEATURE_VALUE_TYPE(chromeos::features::kPrintServerScaling)},

- {"disable-peripheral-data-access-protection",
- flag_descriptions::kDisablePeripheralDataAccessProtectionName,
- flag_descriptions::kDisablePeripheralDataAccessProtectionDescription,
- kOsCrOS,
- FEATURE_VALUE_TYPE(
- chromeos::features::kDisablePeripheralDataAccessProtection)},
#endif // BUILDFLAG(IS_CHROMEOS_ASH)

{"enable-portals", flag_descriptions::kEnablePortalsName,
diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json
index d1116f17..3b6ab06 100644
--- a/chrome/browser/flag-metadata.json
+++ b/chrome/browser/flag-metadata.json
@@ -1090,12 +1090,6 @@
"expiry_milestone": 88
},
{
- "name": "disable-peripheral-data-access-protection",
- "owners": [ "raj...@google.com", "cza...@google.com",
- "cros-per...@google.com" ],
- "expiry_milestone": 94
- },
- {
"name": "disable-threaded-scrolling",
"owners": [ "bokan", "input-dev" ],
// This flag is a useful debugging control when investigating scrolling
diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
index 07be3e7..f1eab56 100644
--- a/chrome/browser/flag_descriptions.cc
+++ b/chrome/browser/flag_descriptions.cc
@@ -997,14 +997,6 @@
const char kMemlogStackModeNativeWithThreadNames[] = "Native with thread names";
const char kMemlogStackModePseudo[] = "Trace events";

-const char kDisablePeripheralDataAccessProtectionName[] =
- "Turn off peripheral data access protection";
-const char kDisablePeripheralDataAccessProtectionDescription[] =
- "Disables data access protection for external PCI devices (including some "
- "thunderbolt and SD Express devices that use PCI tunneling). By default "
- "this feature is disabled, which blocks data access from external PCI "
- "devices.";
-
const char kEnableLoginDetectionName[] = "Enable login detection";
const char kEnableLoginDetectionDescription[] =
"Allow user sign-in to be detected based on heuristics.";
diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
index 878d56a..50464fb 100644
--- a/chrome/browser/flag_descriptions.h
+++ b/chrome/browser/flag_descriptions.h
@@ -564,9 +564,6 @@
extern const char kMemlogStackModeNativeWithThreadNames[];
extern const char kMemlogStackModePseudo[];

-extern const char kDisablePeripheralDataAccessProtectionName[];
-extern const char kDisablePeripheralDataAccessProtectionDescription[];
-
extern const char kDownloadAutoResumptionNativeName[];
extern const char kDownloadAutoResumptionNativeDescription[];