Adapt Chrome OS related part of ChildAccountService.

chrome/browser/supervised_user/child_accounts/child_account_service.cc

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 95ee22533d173017bf3bac3d3d3ffc758a3e4fad..4087c5ed08421803dd26d6a211cdc35f568327a0 100644
--- a/chrome/browser/supervised_user/child_accounts/child_account_service.cc
+++ b/chrome/browser/supervised_user/child_accounts/child_account_service.cc
@@ -251,16 +251,16 @@ void ChildAccountService::SetIsChildAccount(bool 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) {
+    LOG(WARNING) <<
+        "User instance wasn't found while setting child account flag.";
+  } else if (user->GetType() == user_manager::USER_TYPE_REGULAR_SUPERVISED ||
+             user->GetType() == user_manager::USER_TYPE_REGULAR) {
+    user_manager::UserManager::Get()->ChangeUserSupervisedStatus(
+        user, is_child);
+  }
 #endif
 }