Revert of ash: Add checks for supervised users.

ash/system/user/user_card_view.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 "ash/system/user/user_card_view.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "ash/session/session_state_delegate.h"
@@ skipping 376 matching lines @@
           delegate->GetUserInfo(multiprofile_index)->GetEmail());
     if (!user_name_string.empty()) {
       user_name = new views::Label(user_name_string);
       user_name->SetHorizontalAlignment(gfx::ALIGN_LEFT);
     }
   }
 
   views::Label* user_email = NULL;
   if (login_status != user::LOGGED_IN_GUEST &&
       (multiprofile_index || !IsMultiAccountSupportedAndUserActive())) {
-    SystemTrayDelegate* tray_delegate =
-        Shell::GetInstance()->system_tray_delegate();
     base::string16 user_email_string =
-        tray_delegate->IsUserSupervised()
+        login_status == user::LOGGED_IN_SUPERVISED
             ? l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_SUPERVISED_LABEL)
             : base::UTF8ToUTF16(
                   delegate->GetUserInfo(multiprofile_index)->GetEmail());
     if (!user_email_string.empty()) {
       user_email = new views::Label(user_email_string);
       user_email->SetFontList(
           ui::ResourceBundle::GetSharedInstance().GetFontList(
               ui::ResourceBundle::SmallFont));
       user_email->SetHorizontalAlignment(gfx::ALIGN_LEFT);
     }
@@ skipping 58 matching lines @@
     content::BrowserContext* context =
         delegate->GetBrowserContextByIndex(multiprofile_index);
     icon->SetImage(delegate->GetUserInfo(context)->GetImage(),
                    gfx::Size(kTrayAvatarSize, kTrayAvatarSize));
   }
   return icon;
 }
 
 }  // namespace tray
 }  // namespace ash