Methods and types rename for child accounts.

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 276 matching lines @@
     profile_->GetPrefs()->SetString(prefs::kSupervisedUserId,
                                     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 =

[Marc Treib, 2014/12/08 13:27:54]

This'll need a rebase on top of https://codereview.chromium.org/785893003/

[merkulova, 2014/12/08 14:56:12]

Definitely it won't be committed until that CL lands. Or you want to reflect
that dependency here?

[Marc Treib, 2014/12/08 15:00:29]

Nah that's fine, just rebase when that one has landed.

+      chromeos::ProfileHelper::Get()->GetUserByProfile(profile_);
+  if (user) {
+    user_manager::UserManager::Get()->ChangeUserChildStatus(user, is_child);
+  } else {
+    LOG(WARNING) <<
+        "User instance wasn't found while setting child account flag.";
+  }
 #endif
 }