Index: ash/system/screen_security/screen_tray_item_unittest.cc |
diff --git a/ash/system/screen_security/screen_tray_item_unittest.cc b/ash/system/screen_security/screen_tray_item_unittest.cc |
index 5c7d9d2a743a97725ef411f7c1190be82758d8f5..122c478ea05b247ce5763aacfac2ef779e0370b0 100644 |
--- a/ash/system/screen_security/screen_tray_item_unittest.cc |
+++ b/ash/system/screen_security/screen_tray_item_unittest.cc |
@@ -10,7 +10,7 @@ |
#include "ash/system/tray/system_tray.h" |
#include "ash/system/tray/system_tray_notifier.h" |
#include "ash/system/tray/tray_item_view.h" |
-#include "ash/test/ash_test.h" |
+#include "ash/test/ash_test_base.h" |
#include "base/callback.h" |
#include "base/memory/ptr_util.h" |
#include "base/strings/utf_string_conversions.h" |
@@ -36,7 +36,7 @@ void ClickViewCenter(views::View* view) { |
ui::EventTimeForNow(), ui::EF_NONE, ui::EF_NONE)); |
} |
-class ScreenTrayItemTest : public AshTest { |
+class ScreenTrayItemTest : public test::AshTestBase { |
public: |
ScreenTrayItemTest() : tray_item_(NULL), stop_callback_hit_count_(0) {} |
~ScreenTrayItemTest() override {} |
@@ -47,7 +47,7 @@ class ScreenTrayItemTest : public AshTest { |
int stop_callback_hit_count() const { return stop_callback_hit_count_; } |
void SetUp() override { |
- AshTest::SetUp(); |
+ AshTestBase::SetUp(); |
TrayItemView::DisableAnimationsForTest(); |
} |
@@ -192,7 +192,7 @@ void TestSystemTrayInteraction(ScreenTrayItemTest* test) { |
EXPECT_FALSE(tray_item->tray_view()->visible()); |
std::vector<SystemTrayItem*> tray_items = |
- AshTest::GetPrimarySystemTray()->GetTrayItems(); |
+ test::AshTestBase::GetPrimarySystemTray()->GetTrayItems(); |
EXPECT_NE(std::find(tray_items.begin(), tray_items.end(), tray_item), |
tray_items.end()); |
@@ -200,16 +200,16 @@ void TestSystemTrayInteraction(ScreenTrayItemTest* test) { |
EXPECT_TRUE(tray_item->tray_view()->visible()); |
// The default view should be created in a new bubble. |
- AshTest::GetPrimarySystemTray()->ShowDefaultView(BUBBLE_CREATE_NEW); |
+ test::AshTestBase::GetPrimarySystemTray()->ShowDefaultView(BUBBLE_CREATE_NEW); |
EXPECT_TRUE(tray_item->default_view()); |
- AshTest::GetPrimarySystemTray()->CloseSystemBubble(); |
+ test::AshTestBase::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. |
- AshTest::GetPrimarySystemTray()->ShowDefaultView(BUBBLE_CREATE_NEW); |
+ test::AshTestBase::GetPrimarySystemTray()->ShowDefaultView(BUBBLE_CREATE_NEW); |
EXPECT_FALSE(tray_item->default_view()->visible()); |
} |