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

Unified Diff: chrome/browser/ui/ash/multi_user/user_switch_util_unittest.cc

Issue 2144083002: mash: Move user_switch_util to chrome. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 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: chrome/browser/ui/ash/multi_user/user_switch_util_unittest.cc
diff --git a/ash/system/chromeos/multi_user/user_switch_util_unittest.cc b/chrome/browser/ui/ash/multi_user/user_switch_util_unittest.cc
similarity index 98%
rename from ash/system/chromeos/multi_user/user_switch_util_unittest.cc
rename to chrome/browser/ui/ash/multi_user/user_switch_util_unittest.cc
index ef2f691ee2b6f711c5df98b5a5eb8bd5f151af37..2c60b6ff1b31ecf4f41bb2e907280d4e23ecced0 100644
--- a/ash/system/chromeos/multi_user/user_switch_util_unittest.cc
+++ b/chrome/browser/ui/ash/multi_user/user_switch_util_unittest.cc
@@ -3,10 +3,9 @@
// found in the LICENSE file.
#include "ash/common/system/chromeos/screen_security/screen_tray_item.h"
-#include "ash/shell.h"
-#include "ash/system/chromeos/multi_user/user_switch_util.h"
#include "ash/system/tray/system_tray.h"
#include "ash/test/ash_test_base.h"
+#include "chrome/browser/ui/ash/multi_user/user_switch_util.h"
namespace ash {
@@ -29,7 +28,7 @@ class TrySwitchingUserTest : public ash::test::AshTestBase {
void SetUp() override {
test::AshTestBase::SetUp();
TrayItemView::DisableAnimationsForTest();
- SystemTray* system_tray = Shell::GetInstance()->GetPrimarySystemTray();
+ SystemTray* system_tray = GetPrimarySystemTray();
share_item_ = system_tray->GetScreenShareItem();
capture_item_ = system_tray->GetScreenCaptureItem();
EXPECT_TRUE(share_item_);

Powered by Google App Engine
This is Rietveld 408576698