| Index: chrome/browser/prefs/browser_prefs.cc
|
| diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
|
| index f28f1ce5b8218fb6fc41ecfb58a6f0a71afb46f8..c212a3fd4952a1472ae5a939747f028cbf11b41b 100644
|
| --- a/chrome/browser/prefs/browser_prefs.cc
|
| +++ b/chrome/browser/prefs/browser_prefs.cc
|
| @@ -128,7 +128,6 @@
|
| #include "chrome/browser/extensions/activity_log/activity_log.h"
|
| #include "chrome/browser/extensions/api/commands/command_service.h"
|
| #include "chrome/browser/extensions/api/tabs/tabs_api.h"
|
| -#include "chrome/browser/extensions/component_migration_helper.h"
|
| #include "chrome/browser/extensions/extension_web_ui.h"
|
| #include "chrome/browser/extensions/launch_util.h"
|
| #include "chrome/browser/signin/easy_unlock_service.h"
|
| @@ -532,7 +531,6 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
|
| RegisterAnimationPolicyPrefs(registry);
|
| ToolbarActionsBar::RegisterProfilePrefs(registry);
|
| extensions::ActivityLog::RegisterProfilePrefs(registry);
|
| - extensions::ComponentMigrationHelper::RegisterPrefs(registry);
|
| extensions::ExtensionPrefs::RegisterProfilePrefs(registry);
|
| extensions::launch_util::RegisterProfilePrefs(registry);
|
| extensions::RuntimeAPI::RegisterPrefs(registry);
|
| @@ -796,6 +794,11 @@ void MigrateObsoleteProfilePrefs(Profile* profile) {
|
| // Added 9/2016.
|
| profile_prefs->ClearPref(kWebKitUsesUniversalDetector);
|
| profile_prefs->ClearPref(kWebKitAllowDisplayingInsecureContent);
|
| +
|
| +#if BUILDFLAG(ENABLE_EXTENSIONS)
|
| + // Added 2/2017.
|
| + profile_prefs->ClearPref(prefs::kToolbarMigratedComponentActionStatus);
|
| +#endif
|
| }
|
|
|
| } // namespace chrome
|
|
|