[DIPS] move dips_features to //content/public
As a first step to moving the entire dips project to //content, move the feature flag to //content.
Bug: 1399545
Change-Id: I1a1b7e69c6fa90b6bdaee6956d0ef9ab43287c85
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4770460
Reviewed-by: Joshua Hood <[email protected]>
Reviewed-by: Avi Drissman <[email protected]>
Commit-Queue: Patricia Alfonso <[email protected]>
Cr-Commit-Position: refs/heads/main@{#1184377}
diff --git a/chrome/browser/devtools/protocol/devtools_protocol_browsertest.cc b/chrome/browser/devtools/protocol/devtools_protocol_browsertest.cc
index 1a09548..3ffff6e 100644
--- a/chrome/browser/devtools/protocol/devtools_protocol_browsertest.cc
+++ b/chrome/browser/devtools/protocol/devtools_protocol_browsertest.cc
@@ -21,7 +21,6 @@
#include "chrome/browser/data_saver/data_saver.h"
#include "chrome/browser/devtools/devtools_window.h"
#include "chrome/browser/devtools/protocol/devtools_protocol_test_support.h"
-#include "chrome/browser/dips/dips_features.h"
#include "chrome/browser/dips/dips_service.h"
#include "chrome/browser/dips/dips_storage.h"
#include "chrome/browser/extensions/extension_service.h"
@@ -397,7 +396,7 @@
protected:
void SetUp() override {
scoped_feature_list_.InitAndEnableFeatureWithParameters(
- dips::kFeature,
+ features::kDIPS,
{{"delete", "true"}, {"triggering_action", "stateful_bounce"}});
DevToolsProtocolTest::SetUp();
@@ -454,13 +453,13 @@
: public DevToolsProtocolTest,
public testing::WithParamInterface<std::tuple<bool, bool, std::string>> {
// The fields of `GetParam()` indicate/control the following:
- // `std::get<0>(GetParam())` => `dips::kFeature`
- // `std::get<1>(GetParam())` => `dips::kDeletionEnabled`
- // `std::get<2>(GetParam())` => `dips::kTriggeringAction`
+ // `std::get<0>(GetParam())` => `features::kDIPS`
+ // `std::get<1>(GetParam())` => `features::kDIPSDeletionEnabled`
+ // `std::get<2>(GetParam())` => `features::kDIPSTriggeringAction`
//
- // In order for Bounce Tracking Mitigations to take effect, `kFeature` must
- // be true/enabled, `kDeletionEnabled` must be true, and `kTriggeringAction`
- // must NOT be `none`.
+ // In order for Bounce Tracking Mitigations to take effect, `features::kDIPS`
+ // must be true/enabled, `kDeletionEnabled` must be true, and
+ // `kTriggeringAction` must NOT be `none`.
//
// Note: Bounce Tracking Mitigations issues only report sites that would
// be affected when `kTriggeringAction` is set to 'stateful_bounce'.
@@ -469,11 +468,11 @@
void SetUp() override {
if (std::get<0>(GetParam())) {
scoped_feature_list_.InitAndEnableFeatureWithParameters(
- dips::kFeature,
+ features::kDIPS,
{{"delete", (std::get<1>(GetParam()) ? "true" : "false")},
{"triggering_action", std::get<2>(GetParam())}});
} else {
- scoped_feature_list_.InitAndDisableFeature(dips::kFeature);
+ scoped_feature_list_.InitAndDisableFeature(features::kDIPS);
}
DevToolsProtocolTest::SetUp();
diff --git a/chrome/browser/devtools/protocol/system_info_handler.cc b/chrome/browser/devtools/protocol/system_info_handler.cc
index 8788073..bcbb1449 100644
--- a/chrome/browser/devtools/protocol/system_info_handler.cc
+++ b/chrome/browser/devtools/protocol/system_info_handler.cc
@@ -4,10 +4,10 @@
#include "chrome/browser/devtools/protocol/system_info_handler.h"
-#include "chrome/browser/dips/dips_features.h"
-#include "chrome/browser/dips/dips_utils.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/web_contents.h"
+#include "content/public/common/content_features.h"
+#include "content/public/common/dips_utils.h"
SystemInfoHandler::SystemInfoHandler(protocol::UberDispatcher* dispatcher) {
protocol::SystemInfo::Dispatcher::wire(dispatcher, this);
@@ -19,10 +19,10 @@
const std::string& in_featureState,
bool* featureEnabled) {
if (in_featureState == "DIPS") {
- *featureEnabled =
- base::FeatureList::IsEnabled(dips::kFeature) &&
- dips::kDeletionEnabled.Get() &&
- (dips::kTriggeringAction.Get() != DIPSTriggeringAction::kNone);
+ *featureEnabled = base::FeatureList::IsEnabled(features::kDIPS) &&
+ features::kDIPSDeletionEnabled.Get() &&
+ (features::kDIPSTriggeringAction.Get() !=
+ content::DIPSTriggeringAction::kNone);
return protocol::Response::Success();
}
