mustash: Convert TraySupervisedUserTest to AshTest

ash/common/system/chromeos/supervised/tray_supervised_user_unittest.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/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"
 #include "ui/message_center/notification_types.h"
 
 using message_center::NotificationList;
 
 namespace ash {
 
-class TraySupervisedUserTest : public test::AshTestBase {
+class TraySupervisedUserTest : public AshTest {
  public:
   TraySupervisedUserTest() {}
   ~TraySupervisedUserTest() override {}
 
  protected:
   message_center::Notification* GetPopup();
 
  private:
   DISALLOW_COPY_AND_ASSIGN(TraySupervisedUserTest);
 };
@@ skipping 17 matching lines @@
 
   void SetUp() override;
   void TearDown() override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(TraySupervisedUserInitialTest);
 };
 
 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) {
   test::TestSystemTrayDelegate* delegate = GetSystemTrayDelegate();
   delegate->SetLoginStatus(LoginStatus::SUPERVISED);
 
   message_center::Notification* notification = GetPopup();
   ASSERT_NE(static_cast<message_center::Notification*>(NULL), notification);
   EXPECT_EQ(static_cast<int>(message_center::SYSTEM_PRIORITY),
             notification->rich_notification_data().priority);
 }
 
 TEST_F(TraySupervisedUserInitialTest, SupervisedUserNoCrash) {
   // Initial login status is already SUPERVISED, which should create
   // the notification and should not cause crashes.
   message_center::Notification* notification = GetPopup();
   ASSERT_NE(static_cast<message_center::Notification*>(NULL), notification);
   EXPECT_EQ(static_cast<int>(message_center::SYSTEM_PRIORITY),
             notification->rich_notification_data().priority);
 }
 
 }  // namespace ash