Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(409)

Unified Diff: ash/system/tray/media_security/multi_profile_media_tray_item_unittest.cc

Issue 2095663004: Revert of mash: Convert TrayBackgroundView to wm common types (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/system/overview/overview_button_tray.cc ('k') | ash/system/tray/system_tray.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/tray/media_security/multi_profile_media_tray_item_unittest.cc
diff --git a/ash/system/tray/media_security/multi_profile_media_tray_item_unittest.cc b/ash/system/tray/media_security/multi_profile_media_tray_item_unittest.cc
index e939f956df3ffe7e9dd556a9cb494012e73ed388..591b31e4ddf31cbe15d6199a508bbc4e529f45c6 100644
--- a/ash/system/tray/media_security/multi_profile_media_tray_item_unittest.cc
+++ b/ash/system/tray/media_security/multi_profile_media_tray_item_unittest.cc
@@ -5,13 +5,12 @@
#include "ash/system/tray/media_security/multi_profile_media_tray_item.h"
#include "ash/ash_view_ids.h"
-#include "ash/common/system/tray/system_tray_bubble.h"
#include "ash/common/system/tray/tray_item_view.h"
+#include "ash/shell.h"
#include "ash/system/status_area_widget.h"
#include "ash/system/tray/system_tray.h"
+#include "ash/system/tray/system_tray_bubble.h"
#include "ash/test/ash_test_base.h"
-#include "ash/test/ash_test_helper.h"
-#include "ash/test/status_area_widget_test_helper.h"
#include "ash/test/test_session_state_delegate.h"
#include "ash/test/test_shell_delegate.h"
#include "ui/views/bubble/tray_bubble_view.h"
@@ -23,18 +22,19 @@
TEST_F(MultiProfileMediaTrayItemTest, NotifyMediaCaptureChange) {
TrayItemView::DisableAnimationsForTest();
test::TestShellDelegate* shell_delegate =
- ash_test_helper()->test_shell_delegate();
+ static_cast<test::TestShellDelegate*>(Shell::GetInstance()->delegate());
test::TestSessionStateDelegate* session_state_delegate =
- test::AshTestHelper::GetTestSessionStateDelegate();
+ static_cast<test::TestSessionStateDelegate*>(
+ Shell::GetInstance()->session_state_delegate());
session_state_delegate->set_logged_in_users(2);
- SystemTray* system_tray = GetPrimarySystemTray();
+ SystemTray* system_tray = Shell::GetInstance()->GetPrimarySystemTray();
system_tray->ShowDefaultView(BUBBLE_CREATE_NEW);
views::View* in_user_view =
system_tray->GetSystemBubble()->bubble_view()->GetViewByID(
VIEW_ID_USER_VIEW_MEDIA_INDICATOR);
- StatusAreaWidget* widget = StatusAreaWidgetTestHelper::GetStatusAreaWidget();
+ StatusAreaWidget* widget = system_tray->status_area_widget();
EXPECT_TRUE(widget->GetRootView()->visible());
views::View* tray_view =
widget->GetRootView()->GetViewByID(VIEW_ID_MEDIA_TRAY_VIEW);
« no previous file with comments | « ash/system/overview/overview_button_tray.cc ('k') | ash/system/tray/system_tray.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698