mutash: Convert ScreenShareTest/ScreenCaptureTest to AshTest

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

 // Copyright 2013 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/screen_security/screen_tray_item.h"
 
 #include "ash/common/system/chromeos/screen_security/screen_capture_tray_item.h"
 #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"
 #include "ui/events/event_utils.h"
 #include "ui/gfx/geometry/point.h"
 #include "ui/message_center/message_center.h"
 #include "ui/views/view.h"
 
 namespace ash {
 
 // Test with unicode strings.
 const char kTestScreenCaptureAppName[] =
     "\xE0\xB2\xA0\x5F\xE0\xB2\xA0 (Screen Capture Test)";
 const char kTestScreenShareHelperName[] =
     "\xE5\xAE\x8B\xE8\x85\xBE (Screen Share Test)";
 
 void ClickViewCenter(views::View* view) {
   gfx::Point click_location_in_local =
       gfx::Point(view->width() / 2, view->height() / 2);
   view->OnMousePressed(ui::MouseEvent(
       ui::ET_MOUSE_PRESSED, click_location_in_local, click_location_in_local,
       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 {}
 
   ScreenTrayItem* tray_item() { return tray_item_; }
   void set_tray_item(ScreenTrayItem* tray_item) { tray_item_ = tray_item; }
 
   int stop_callback_hit_count() const { return stop_callback_hit_count_; }
 
   void SetUp() override {
-    test::AshTestBase::SetUp();
+    AshTest::SetUp();
     TrayItemView::DisableAnimationsForTest();
   }
 
   void StartSession() {
     tray_item_->Start(
         base::Bind(&ScreenTrayItemTest::StopCallback, base::Unretained(this)));
   }
 
   void StopSession() { tray_item_->Stop(); }
 
@@ skipping 51 matching lines @@
   EXPECT_TRUE(tray_item->is_started());
 
   test->StopSession();
   EXPECT_FALSE(tray_item->is_started());
   EXPECT_EQ(1, test->stop_callback_hit_count());
 }
 
 TEST_F(ScreenCaptureTest, StartAndStop) {
   TestStartAndStop(this);
 }
+
 TEST_F(ScreenShareTest, StartAndStop) {
   TestStartAndStop(this);
 }
 
 void TestNotificationStartAndStop(ScreenTrayItemTest* test,
                                   const base::Closure& start_function,
                                   const base::Closure& stop_function) {
   ScreenTrayItem* tray_item = test->tray_item();
   EXPECT_FALSE(tray_item->is_started());
 
@@ skipping 42 matching lines @@
   message_center::MessageCenter* message_center =
       message_center::MessageCenter::Get();
   EXPECT_TRUE(message_center->FindVisibleNotificationById(
       tray_item->GetNotificationId()));
   test->StopSession();
 }
 
 TEST_F(ScreenCaptureTest, NotificationView) {
   TestNotificationView(this);
 }
+
 TEST_F(ScreenShareTest, NotificationView) {
   TestNotificationView(this);
 }
 
 void TestSystemTrayInteraction(ScreenTrayItemTest* test) {
   ScreenTrayItem* tray_item = test->tray_item();
   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());
 
   test->StartSession();
   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());
 }
 
 TEST_F(ScreenCaptureTest, SystemTrayInteraction) {
   TestSystemTrayInteraction(this);
 }
 
 TEST_F(ScreenShareTest, SystemTrayInteraction) {
   TestSystemTrayInteraction(this);
 }
 
 }  // namespace ash