Adapt Chrome OS related part of ChildAccountService.

components/user_manager/user.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 "components/user_manager/user.h"
 
 #include "base/logging.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread_restrictions.h"
@@ skipping 118 matching lines @@
 const gfx::ImageSkia& User::GetImage() const {
   return user_image_.image();
 }
 
 std::string User::GetUserID() const {
   return gaia::CanonicalizeEmail(gaia::SanitizeEmail(email()));
 }
 
 void User::SetIsSupervised(bool is_supervised) {
   VLOG(1) << "Ignoring SetIsSupervised call with param " << is_supervised;
-  NOTREACHED() << "Calling SetIsSupervised for base User class.";
+  if (is_supervised) {
+    NOTREACHED() << "Calling SetIsSupervised(true) for base User class. "
+                 << "Base class cannot be set as supervised";
+  }
 }
 
 bool User::HasGaiaAccount() const {
   return TypeHasGaiaAccount(GetType());
 }
 
 bool User::IsSupervised() const {
   UserType type = GetType();
   return  type == USER_TYPE_SUPERVISED ||
           type == USER_TYPE_REGULAR_SUPERVISED;
@@ skipping 193 matching lines @@
     case user_manager::USER_TYPE_SUPERVISED:
     case user_manager::USER_TYPE_KIOSK_APP:
       return false;
     default:
       NOTREACHED();
   }
   return false;
 }
 
 }  // namespace user_manager