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

Unified Diff: ash/common/system/chromeos/media_security/multi_profile_media_tray_item_unittest.cc

Issue 2734653002: chromeos: Move files in //ash/common to //ash (Closed)
Patch Set: fix a11y tests, fix docs Created 3 years, 10 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
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
deleted file mode 100644
index d09cd84e2dedaa9559e155f29dd5035d88a1dc76..0000000000000000000000000000000000000000
--- a/ash/common/system/chromeos/media_security/multi_profile_media_tray_item_unittest.cc
+++ /dev/null
@@ -1,78 +0,0 @@
-// Copyright 2014 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/media_security/multi_profile_media_tray_item.h"
-
-#include "ash/common/ash_view_ids.h"
-#include "ash/common/media_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"
-#include "ash/test/ash_test_helper.h"
-#include "ash/test/status_area_widget_test_helper.h"
-#include "ash/test/test_shell_delegate.h"
-#include "ui/views/bubble/tray_bubble_view.h"
-
-namespace ash {
-
-class MultiProfileMediaTrayItemTest : public test::AshTestBase {
- public:
- MultiProfileMediaTrayItemTest() {}
- ~MultiProfileMediaTrayItemTest() override {}
-
- void SetMediaCaptureState(mojom::MediaCaptureState state) {
- // Create the fake update.
- test::TestSessionStateDelegate* session_state_delegate =
- test::AshTestHelper::GetTestSessionStateDelegate();
- std::vector<mojom::MediaCaptureState> v;
- for (int i = 0; i < session_state_delegate->NumberOfLoggedInUsers(); ++i)
- v.push_back(state);
- WmShell::Get()->media_controller()->NotifyCaptureState(v);
- }
-
- private:
- DISALLOW_COPY_AND_ASSIGN(MultiProfileMediaTrayItemTest);
-};
-
-// 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);
-
- SystemTray* system_tray = 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();
- EXPECT_TRUE(widget->GetRootView()->visible());
- views::View* tray_view =
- widget->GetRootView()->GetViewByID(VIEW_ID_MEDIA_TRAY_VIEW);
-
- SetMediaCaptureState(mojom::MediaCaptureState::NONE);
- EXPECT_FALSE(tray_view->visible());
- EXPECT_FALSE(in_user_view->visible());
-
- SetMediaCaptureState(mojom::MediaCaptureState::AUDIO);
- EXPECT_TRUE(tray_view->visible());
- EXPECT_TRUE(in_user_view->visible());
-
- SetMediaCaptureState(mojom::MediaCaptureState::AUDIO_VIDEO);
- EXPECT_TRUE(tray_view->visible());
- EXPECT_TRUE(in_user_view->visible());
-
- SetMediaCaptureState(mojom::MediaCaptureState::NONE);
- EXPECT_FALSE(tray_view->visible());
- EXPECT_FALSE(in_user_view->visible());
-}
-
-} // namespace ash
« no previous file with comments | « ash/common/system/chromeos/media_security/multi_profile_media_tray_item.cc ('k') | ash/common/system/chromeos/network/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698