mustash: Convert TraySupervisedUserTest to AshTest

ash/common/system/chromeos/supervised/tray_supervised_user_unittest.cc

Index: ash/common/system/chromeos/supervised/tray_supervised_user_unittest.cc
diff --git a/ash/common/system/chromeos/supervised/tray_supervised_user_unittest.cc b/ash/common/system/chromeos/supervised/tray_supervised_user_unittest.cc
index 4d1ff167dc549c2181621cfc4ad54c4851640895..e2b95997e82bd96a7603fa3a6dd19f0f9be5b726 100644
--- a/ash/common/system/chromeos/supervised/tray_supervised_user_unittest.cc
+++ b/ash/common/system/chromeos/supervised/tray_supervised_user_unittest.cc
@@ -5,8 +5,8 @@
 #include "ash/common/system/chromeos/supervised/tray_supervised_user.h"
 
 #include "ash/common/login_status.h"
+#include "ash/common/test/ash_test.h"
 #include "ash/common/test/test_system_tray_delegate.h"
-#include "ash/test/ash_test_base.h"
 #include "ui/message_center/message_center.h"
 #include "ui/message_center/notification.h"
 #include "ui/message_center/notification_list.h"
@@ -16,7 +16,7 @@ using message_center::NotificationList;
 
 namespace ash {
 
-class TraySupervisedUserTest : public test::AshTestBase {
+class TraySupervisedUserTest : public AshTest {
  public:
   TraySupervisedUserTest() {}
   ~TraySupervisedUserTest() override {}
@@ -54,12 +54,13 @@ class TraySupervisedUserInitialTest : public TraySupervisedUserTest {
 
 void TraySupervisedUserInitialTest::SetUp() {
   test::TestSystemTrayDelegate::SetInitialLoginStatus(LoginStatus::SUPERVISED);
-  test::AshTestBase::SetUp();
+  AshTest::SetUp();
 }
 
 void TraySupervisedUserInitialTest::TearDown() {
-  test::AshTestBase::TearDown();
-  // SetInitialLoginStatus() is reset in AshTestHelper::TearDown().
+  AshTest::TearDown();
+  // Reset the initial login status to the default.
+  test::TestSystemTrayDelegate::SetInitialLoginStatus(LoginStatus::USER);

[James Cook, 2016/10/13 23:03:21]

See CL comment for why I did this. It's ugly, but better than the alternative.

 }
 
 TEST_F(TraySupervisedUserTest, SupervisedUserHasNotification) {