| Index: chrome/browser/extensions/activity_log/activity_log.cc
|
| diff --git a/chrome/browser/extensions/activity_log/activity_log.cc b/chrome/browser/extensions/activity_log/activity_log.cc
|
| index 110dfa0f7e2d083c25dc679fd199610a5e9eb238..849bc86fcd4152f30f95dc8e045b2ddd6fc35625 100644
|
| --- a/chrome/browser/extensions/activity_log/activity_log.cc
|
| +++ b/chrome/browser/extensions/activity_log/activity_log.cc
|
| @@ -364,11 +364,6 @@ ActivityLog::ActivityLog(content::BrowserContext* context)
|
| switches::kEnableExtensionActivityLogTesting);
|
|
|
| // Check if the watchdog extension is previously installed and active.
|
| - // It was originally a boolean, but we've had to move to an integer. Handle
|
| - // the legacy case.
|
| - // TODO(felt): In M34, remove the legacy code & old pref.
|
| - if (profile_->GetPrefs()->GetBoolean(prefs::kWatchdogExtensionActiveOld))
|
| - profile_->GetPrefs()->SetInteger(prefs::kWatchdogExtensionActive, 1);
|
| watchdog_apps_active_ =
|
| profile_->GetPrefs()->GetInteger(prefs::kWatchdogExtensionActive);
|
|
|
| @@ -521,10 +516,6 @@ void ActivityLog::RegisterProfilePrefs(
|
| prefs::kWatchdogExtensionActive,
|
| false,
|
| user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
|
| - registry->RegisterBooleanPref(
|
| - prefs::kWatchdogExtensionActiveOld,
|
| - false,
|
| - user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
|
| }
|
|
|
| // LOG ACTIONS. ----------------------------------------------------------------
|
|
|