mutash: Convert ScreenShareTest/ScreenCaptureTest to AshTest

ash/common/system/chromeos/screen_security/screen_tray_item_unittest.cc

Index: ash/common/system/chromeos/screen_security/screen_tray_item_unittest.cc
diff --git a/ash/common/system/chromeos/screen_security/screen_tray_item_unittest.cc b/ash/common/system/chromeos/screen_security/screen_tray_item_unittest.cc
index 997038cabfeed1a569a4a6d69fec4474b98ed454..820baf124fdc64a277974e12ae8be5e3f7c15419 100644
--- a/ash/common/system/chromeos/screen_security/screen_tray_item_unittest.cc
+++ b/ash/common/system/chromeos/screen_security/screen_tray_item_unittest.cc
@@ -8,8 +8,8 @@
 #include "ash/common/system/chromeos/screen_security/screen_share_tray_item.h"
 #include "ash/common/system/tray/system_tray_notifier.h"
 #include "ash/common/system/tray/tray_item_view.h"
+#include "ash/common/test/ash_test.h"
 #include "ash/common/wm_shell.h"
-#include "ash/test/ash_test_base.h"
 #include "base/callback.h"
 #include "base/strings/utf_string_conversions.h"
 #include "ui/events/event.h"
@@ -34,7 +34,7 @@ void ClickViewCenter(views::View* view) {
       ui::EventTimeForNow(), ui::EF_NONE, ui::EF_NONE));
 }
 
-class ScreenTrayItemTest : public ash::test::AshTestBase {
+class ScreenTrayItemTest : public AshTest {
  public:
   ScreenTrayItemTest() : tray_item_(NULL), stop_callback_hit_count_(0) {}
   ~ScreenTrayItemTest() override {}
@@ -45,7 +45,7 @@ class ScreenTrayItemTest : public ash::test::AshTestBase {
   int stop_callback_hit_count() const { return stop_callback_hit_count_; }
 
   void SetUp() override {
-    test::AshTestBase::SetUp();
+    AshTest::SetUp();
     TrayItemView::DisableAnimationsForTest();
   }
 
@@ -117,6 +117,7 @@ void TestStartAndStop(ScreenTrayItemTest* test) {
 TEST_F(ScreenCaptureTest, StartAndStop) {
   TestStartAndStop(this);
 }
+
 TEST_F(ScreenShareTest, StartAndStop) {
   TestStartAndStop(this);
 }
@@ -179,6 +180,7 @@ void TestNotificationView(ScreenTrayItemTest* test) {
 TEST_F(ScreenCaptureTest, NotificationView) {
   TestNotificationView(this);
 }
+
 TEST_F(ScreenShareTest, NotificationView) {
   TestNotificationView(this);
 }
@@ -188,7 +190,7 @@ void TestSystemTrayInteraction(ScreenTrayItemTest* test) {
   EXPECT_FALSE(tray_item->tray_view()->visible());
 
   const std::vector<SystemTrayItem*>& tray_items =
-      test::AshTestBase::GetPrimarySystemTray()->GetTrayItems();
+      AshTest::GetPrimarySystemTray()->GetTrayItems();
   EXPECT_NE(std::find(tray_items.begin(), tray_items.end(), tray_item),
             tray_items.end());
 
@@ -196,16 +198,16 @@ void TestSystemTrayInteraction(ScreenTrayItemTest* test) {
   EXPECT_TRUE(tray_item->tray_view()->visible());
 
   // The default view should be created in a new bubble.
-  test::AshTestBase::GetPrimarySystemTray()->ShowDefaultView(BUBBLE_CREATE_NEW);
+  AshTest::GetPrimarySystemTray()->ShowDefaultView(BUBBLE_CREATE_NEW);
   EXPECT_TRUE(tray_item->default_view());
-  test::AshTestBase::GetPrimarySystemTray()->CloseSystemBubble();
+  AshTest::GetPrimarySystemTray()->CloseSystemBubble();
   EXPECT_FALSE(tray_item->default_view());
 
   test->StopSession();
   EXPECT_FALSE(tray_item->tray_view()->visible());
 
   // The default view should not be visible because session is stopped.
-  test::AshTestBase::GetPrimarySystemTray()->ShowDefaultView(BUBBLE_CREATE_NEW);
+  AshTest::GetPrimarySystemTray()->ShowDefaultView(BUBBLE_CREATE_NEW);
   EXPECT_FALSE(tray_item->default_view()->visible());
 }