Adapt Chrome OS related part of ChildAccountService.

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 233 matching lines @@
     profile_->GetPrefs()->SetString(prefs::kSupervisedUserId,
                                     supervised_users::kChildAccountSUID);
   } else {
     profile_->GetPrefs()->ClearPref(prefs::kSupervisedUserId);
   }
   PropagateChildStatusToUser(is_child_account);
 }
 
 void ChildAccountService::PropagateChildStatusToUser(bool is_child) {
 #if defined(OS_CHROMEOS)
-  // TODO(merkulova,treib): Figure out why this causes tests to fail.
-//  user_manager::User* user =
-//      chromeos::ProfileHelper::Get()->GetUserByProfile(profile_);
-//  if (user) {
-//    user_manager::UserManager::Get()->ChangeUserSupervisedStatus(
-//        user, is_child);
-//  } else {
-//    LOG(WARNING) <<
-//        "User instance wasn't found while setting child account flag.";
-//  }
+  user_manager::User* user =
+      chromeos::ProfileHelper::Get()->GetUserByProfile(profile_);
+  if (user) {
+    user_manager::UserManager::Get()->ChangeUserSupervisedStatus(
+        user, is_child);
+  } else {
+    LOG(WARNING) <<
+        "User instance wasn't found while setting child account flag.";
+  }
 #endif
 }
 
 void ChildAccountService::SetFirstCustodianPrefs(
     const FamilyInfoFetcher::FamilyMember& custodian) {
   profile_->GetPrefs()->SetString(prefs::kSupervisedUserCustodianName,
                                   custodian.display_name);
   profile_->GetPrefs()->SetString(prefs::kSupervisedUserCustodianEmail,
                                   custodian.email);
   profile_->GetPrefs()->SetString(prefs::kSupervisedUserCustodianProfileURL,
@@ skipping 46 matching lines @@
     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);
 }