Allow to override third-party features on domain-joined machines

Bug: 870998
Change-Id: Ia945042619841fb197f374ca1b2a188916e9764c
Reviewed-on: https://chromium-review.googlesource.com/c/1259826
Commit-Queue: Patrick Monette <pmonette@chromium.org>
Reviewed-by: Chris Hamilton <chrisha@chromium.org>
Cr-Commit-Position: refs/heads/master@{#596411}

chrome/browser/conflicts/module_database_win.cc

@@ -39,6 +39,22 @@ constexpr uint32_t kFirstValidProcessType = content::PROCESS_TYPE_BROWSER;
 
 ModuleDatabase* g_module_database_win_instance = nullptr;
 
+#if defined(GOOGLE_CHROME_BUILD)
+// Returns true if either the IncompatibleApplicationsWarning or
+// ThirdPartyModulesBlocking features are enabled via the "enable-features"
+// command-line switch.
+bool AreThirdPartyFeaturesEnabledViaCommandLine() {
+  base::FeatureList* feature_list_instance = base::FeatureList::GetInstance();
+
+  return feature_list_instance->IsFeatureOverriddenFromCommandLine(
+             features::kIncompatibleApplicationsWarning.name,
+             base::FeatureList::OVERRIDE_ENABLE_FEATURE) ||
+         feature_list_instance->IsFeatureOverriddenFromCommandLine(
+             features::kThirdPartyModulesBlocking.name,
+             base::FeatureList::OVERRIDE_ENABLE_FEATURE);
+}
+#endif  // defined(GOOGLE_CHROME_BUILD)
+
 }  // namespace
 
 // static
@@ -344,11 +360,14 @@ void ModuleDatabase::MaybeInitializeThirdPartyConflictsManager() {
   // Temporarily disable this class on domain-joined machines because enterprise
   // clients depend on IAttachmentExecute::Save() to be invoked for downloaded
   // files, but that API call has a known issue (https://crbug.com/870998) with
-  // third-party modules blocking.
+  // third-party modules blocking. Can be Overridden by enabling the feature via
+  // the command-line.
   // TODO(pmonette): Move IAttachmentExecute::Save() to a utility process and
   //                 remove this.
-  if (base::win::IsEnterpriseManaged())
+  if (base::win::IsEnterpriseManaged() &&
+      !AreThirdPartyFeaturesEnabledViaCommandLine()) {
     return;
+  }
 
   if (!IsThirdPartyBlockingPolicyEnabled())
     return;