DLP: Enable DLP policy feature on M88.

As Clipboard and OnScreen content restrictions are going to be launched
in M88 (crbug/1105991, crbug/1105980), we are enabling the policy parsing
by default.

Bug: 1105991, 1105980
Change-Id: Ibe08f323e392101db320b0103f0a1b43822a84c1
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2529095Reviewed-by: Aya Elsayed <ayaelattar@chromium.org>
Reviewed-by: Nikita Podguzov <nikitapodguzov@chromium.org>
Commit-Queue: Sergey Poromov <poromov@chromium.org>
Cr-Commit-Position: refs/heads/master@{#826525}

chrome/browser/chromeos/policy/dlp/dlp_content_manager_browsertest.cc

@@ -4,7 +4,6 @@
 
 #include "chrome/browser/chromeos/policy/dlp/dlp_content_manager.h"
 
-#include "base/test/scoped_feature_list.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/policy/dlp/dlp_rules_manager.h"
 #include "chrome/browser/chromeos/policy/dlp/dlp_rules_manager_test_utils.h"
@@ -14,7 +13,6 @@
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_window.h"
-#include "chrome/common/chrome_features.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "components/policy/core/common/policy_map.h"
@@ -275,13 +273,7 @@ IN_PROC_BROWSER_TEST_F(DlpContentManagerBrowserTest,
 
 class DlpContentManagerPolicyBrowserTest : public PolicyTest {
  public:
-  DlpContentManagerPolicyBrowserTest() {
-    scoped_feature_list_.InitAndEnableFeature(
-        features::kDataLeakPreventionPolicy);
-  }
-
- private:
-  base::test::ScopedFeatureList scoped_feature_list_;
+  DlpContentManagerPolicyBrowserTest() = default;
 };
 
 IN_PROC_BROWSER_TEST_F(DlpContentManagerPolicyBrowserTest,

chrome/browser/chromeos/policy/dlp/dlp_rules_manager_browsertest.cc

@@ -2,12 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "base/test/scoped_feature_list.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/policy/dlp/dlp_rules_manager.h"
 #include "chrome/browser/chromeos/policy/dlp/dlp_rules_manager_test_utils.h"
 #include "chrome/browser/policy/policy_test_utils.h"
-#include "chrome/common/chrome_features.h"
 #include "components/policy/core/common/policy_map.h"
 #include "components/policy/policy_constants.h"
 #include "content/public/test/browser_test.h"
@@ -20,13 +18,7 @@ constexpr char kUrlStr1[] = "https://wwww.example.com";
 
 class DlpRulesPolicyTest : public PolicyTest {
  public:
-  DlpRulesPolicyTest() {
-    scoped_feature_list_.InitAndEnableFeature(
-        features::kDataLeakPreventionPolicy);
-  }
-
- private:
-  base::test::ScopedFeatureList scoped_feature_list_;
+  DlpRulesPolicyTest() = default;
 };
 
 IN_PROC_BROWSER_TEST_F(DlpRulesPolicyTest, ParsePolicyPref) {

chrome/browser/chromeos/policy/dlp/dlp_rules_manager_unittest.cc

@@ -62,9 +62,6 @@ class DlpRulesManagerTest : public testing::Test {
   void SetUp() override {
     testing::Test::SetUp();
 
-    scoped_feature_list_.InitAndEnableFeature(
-        features::kDataLeakPreventionPolicy);
-
     DlpRulesManager::Init();
     dlp_rules_manager_ = DlpRulesManager::Get();
   }
@@ -81,7 +78,6 @@ class DlpRulesManagerTest : public testing::Test {
   }
 
   DlpRulesManager* dlp_rules_manager_;
-  base::test::ScopedFeatureList scoped_feature_list_;
 
  private:
   ScopedTestingLocalState testing_local_state_;
@@ -417,8 +413,8 @@ TEST_F(DlpRulesManagerTest, DisabledByFeature) {
                 GURL(kUrlStr1), DlpRulesManager::Restriction::kScreenshot));
 
   // Disable feature
-  scoped_feature_list_.Reset();
-  scoped_feature_list_.InitAndDisableFeature(
+  base::test::ScopedFeatureList scoped_feature_list;
+  scoped_feature_list.InitAndDisableFeature(
       features::kDataLeakPreventionPolicy);
   UpdatePolicyPref(std::move(rules));
 

chrome/common/chrome_features.cc

@@ -215,8 +215,8 @@ const base::Feature kCryptohomeUserDataAuthKillswitch{
 // Enables parsing and enforcing Data Leak Prevention policy rules that
 // restricts usage of some system features, e.g.clipboard, screenshot, etc.
 // for confidential content.
-const base::Feature kDataLeakPreventionPolicy{
-    "DataLeakPreventionPolicy", base::FEATURE_DISABLED_BY_DEFAULT};
+const base::Feature kDataLeakPreventionPolicy{"DataLeakPreventionPolicy",
+                                              base::FEATURE_ENABLED_BY_DEFAULT};
 #endif
 
 #if defined(OS_CHROMEOS)