Reland "Wire-up the ThirdPartyBlocking group policy"
This is a reland of a54726ff975e09efe95d241091a32954bdd58468
Original change's description:
> Wire-up the ThirdPartyBlocking group policy
>
> To make this happen, the ProblematicProgramsUpdater class needed a
> refactoring. This is because we do not support dynamic refresh of the
> group policy, so its value needed to be cached somehow (as it can still
> change during runtime).
>
> Now, the presence of the ThirdPartyConflictsManager indicates if the
> feature is enabled or not.
>
> Bug: 822399
> Change-Id: Ia9b0b5e52df2c777b343ccc3e524ee17a1ab0e57
> Reviewed-on: https://chromium-review.googlesource.com/964785
> Commit-Queue: Patrick Monette <[email protected]>
> Reviewed-by: Jochen Eisinger <[email protected]>
> Reviewed-by: Greg Thompson <[email protected]>
> Cr-Commit-Position: refs/heads/master@{#544439}
TBR: [email protected], [email protected]
Bug: 822399
Change-Id: Ic9236dc69b3c89d882894c24bd7d172f110dc27a
Reviewed-on: https://chromium-review.googlesource.com/971921
Reviewed-by: Patrick Monette <[email protected]>
Commit-Queue: Patrick Monette <[email protected]>
Cr-Commit-Position: refs/heads/master@{#544579}diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index a1bb49f..91b4eb6 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -272,6 +272,7 @@
#include "chrome/browser/apps/app_launch_for_metro_restart_win.h"
#include "chrome/browser/component_updater/sw_reporter_installer_win.h"
#if defined(GOOGLE_CHROME_BUILD)
+#include "chrome/browser/conflicts/module_database_win.h"
#include "chrome/browser/conflicts/problematic_programs_updater_win.h"
#endif // defined(GOOGLE_CHROME_BUILD)
#include "chrome/browser/safe_browsing/chrome_cleaner/settings_resetter_win.h"
@@ -466,6 +467,7 @@
desktop_ios_promotion::RegisterLocalPrefs(registry);
password_manager::PasswordManager::RegisterLocalPrefs(registry);
#if defined(GOOGLE_CHROME_BUILD)
+ ModuleDatabase::RegisterLocalStatePrefs(registry);
ProblematicProgramsUpdater::RegisterLocalStatePrefs(registry);
#endif // defined(GOOGLE_CHROME_BUILD)
#endif
