Supervised user SafeSites: Add a field trial to turn on/off

chrome/browser/supervised_user/child_accounts/child_account_service.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/supervised_user/child_accounts/child_account_service.h"
 
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
@@ skipping 163 matching lines @@
 #endif
 
     // TODO(treib): Maybe store the last update time in a pref, so we don't
     // have to re-fetch on every start.
     StartFetchingFamilyInfo();
 
     SupervisedUserService* service =
         SupervisedUserServiceFactory::GetForProfile(profile_);
     service->AddPermissionRequestCreator(
         PermissionRequestCreatorApiary::CreateWithProfile(profile_));
-
-    EnableExperimentalFiltering();
   } else {
     SupervisedUserSettingsService* settings_service =
         SupervisedUserSettingsServiceFactory::GetForProfile(profile_);
     settings_service->SetLocalSetting(supervised_users::kSigninAllowed,
                                       scoped_ptr<base::Value>());
 #if !defined(OS_CHROMEOS)
     SigninManagerFactory::GetForProfile(profile_)->ProhibitSignout(false);
 #endif
 
     ClearFirstCustodianPrefs();
@@ skipping 223 matching lines @@
 }
 
 void ChildAccountService::ClearSecondCustodianPrefs() {
   profile_->GetPrefs()->ClearPref(prefs::kSupervisedUserSecondCustodianName);
   profile_->GetPrefs()->ClearPref(prefs::kSupervisedUserSecondCustodianEmail);
   profile_->GetPrefs()->ClearPref(
       prefs::kSupervisedUserSecondCustodianProfileURL);
   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);
-}