| Index: ash/common/system/chromeos/media_security/multi_profile_media_tray_item_unittest.cc
|
| diff --git a/ash/common/system/chromeos/media_security/multi_profile_media_tray_item_unittest.cc b/ash/common/system/chromeos/media_security/multi_profile_media_tray_item_unittest.cc
|
| index d09cd84e2dedaa9559e155f29dd5035d88a1dc76..fdcfd81093a5a59b0a7b1850410d0752c12398c3 100644
|
| --- a/ash/common/system/chromeos/media_security/multi_profile_media_tray_item_unittest.cc
|
| +++ b/ash/common/system/chromeos/media_security/multi_profile_media_tray_item_unittest.cc
|
| @@ -6,11 +6,11 @@
|
|
|
| #include "ash/common/ash_view_ids.h"
|
| #include "ash/common/media_controller.h"
|
| +#include "ash/common/session/session_controller.h"
|
| #include "ash/common/system/status_area_widget.h"
|
| #include "ash/common/system/tray/system_tray.h"
|
| #include "ash/common/system/tray/system_tray_bubble.h"
|
| #include "ash/common/system/tray/tray_item_view.h"
|
| -#include "ash/common/test/test_session_state_delegate.h"
|
| #include "ash/common/wm_shell.h"
|
| #include "ash/public/interfaces/media.mojom.h"
|
| #include "ash/test/ash_test_base.h"
|
| @@ -28,10 +28,9 @@ class MultiProfileMediaTrayItemTest : public test::AshTestBase {
|
|
|
| void SetMediaCaptureState(mojom::MediaCaptureState state) {
|
| // Create the fake update.
|
| - test::TestSessionStateDelegate* session_state_delegate =
|
| - test::AshTestHelper::GetTestSessionStateDelegate();
|
| + SessionController* controller = WmShell::Get()->session_controller();
|
| std::vector<mojom::MediaCaptureState> v;
|
| - for (int i = 0; i < session_state_delegate->NumberOfLoggedInUsers(); ++i)
|
| + for (int i = 0; i < controller->NumberOfLoggedInUsers(); ++i)
|
| v.push_back(state);
|
| WmShell::Get()->media_controller()->NotifyCaptureState(v);
|
| }
|
| @@ -43,9 +42,7 @@ class MultiProfileMediaTrayItemTest : public test::AshTestBase {
|
| // ash_unittests. still failing.
|
| TEST_F(MultiProfileMediaTrayItemTest, NotifyMediaCaptureChange) {
|
| TrayItemView::DisableAnimationsForTest();
|
| - test::TestSessionStateDelegate* session_state_delegate =
|
| - test::AshTestHelper::GetTestSessionStateDelegate();
|
| - session_state_delegate->set_logged_in_users(2);
|
| + GetSessionControllerClient()->SetPredefinedUserSessions(2);
|
|
|
| SystemTray* system_tray = GetPrimarySystemTray();
|
| system_tray->ShowDefaultView(BUBBLE_CREATE_NEW);
|
|
|