| Index: chrome/browser/supervised_user/child_accounts/child_account_service.cc
|
| diff --git a/chrome/browser/supervised_user/child_accounts/child_account_service.cc b/chrome/browser/supervised_user/child_accounts/child_account_service.cc
|
| index c192d83d68710a5c872b50e5e05bc0cacdf3d2a3..9c7e092e6f756b563efa907def98e805013d6a17 100644
|
| --- a/chrome/browser/supervised_user/child_accounts/child_account_service.cc
|
| +++ b/chrome/browser/supervised_user/child_accounts/child_account_service.cc
|
| @@ -181,8 +181,6 @@ bool ChildAccountService::SetActive(bool active) {
|
| SupervisedUserServiceFactory::GetForProfile(profile_);
|
| service->AddPermissionRequestCreator(
|
| PermissionRequestCreatorApiary::CreateWithProfile(profile_));
|
| -
|
| - EnableExperimentalFiltering();
|
| } else {
|
| SupervisedUserSettingsService* settings_service =
|
| SupervisedUserSettingsServiceFactory::GetForProfile(profile_);
|
| @@ -426,23 +424,3 @@ void ChildAccountService::ClearSecondCustodianPrefs() {
|
| profile_->GetPrefs()->ClearPref(
|
| prefs::kSupervisedUserSecondCustodianProfileImageURL);
|
| }
|
| -
|
| -void ChildAccountService::EnableExperimentalFiltering() {
|
| - base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
|
| -
|
| - // Static blacklist defaults to enabled.
|
| - bool has_enable_blacklist =
|
| - command_line->HasSwitch(switches::kEnableSupervisedUserBlacklist);
|
| - bool has_disable_blacklist =
|
| - command_line->HasSwitch(switches::kDisableSupervisedUserBlacklist);
|
| - if (!has_enable_blacklist && !has_disable_blacklist)
|
| - command_line->AppendSwitch(switches::kEnableSupervisedUserBlacklist);
|
| -
|
| - // Query-based filtering also defaults to enabled.
|
| - bool has_enable_safesites =
|
| - command_line->HasSwitch(switches::kEnableSupervisedUserSafeSites);
|
| - bool has_disable_safesites =
|
| - command_line->HasSwitch(switches::kDisableSupervisedUserSafeSites);
|
| - if (!has_enable_safesites && !has_disable_safesites)
|
| - command_line->AppendSwitch(switches::kEnableSupervisedUserSafeSites);
|
| -}
|
|
|