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

Unified Diff: ash/common/system/update/tray_update_unittest.cc

Issue 2059383002: mash: Move TrayUpdate to //ash/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@ashconstants
Patch Set: rebase 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/common/system/update/tray_update.cc ('k') | ash/system/tray/system_tray.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/system/update/tray_update_unittest.cc
diff --git a/ash/system/tray_update_unittest.cc b/ash/common/system/update/tray_update_unittest.cc
similarity index 89%
rename from ash/system/tray_update_unittest.cc
rename to ash/common/system/update/tray_update_unittest.cc
index dbaa8ff9fd8e45dfc33b384656f9aa7ff678a413..edafe03cc7317b589138d8c9ccb3610686439e95 100644
--- a/ash/system/tray_update_unittest.cc
+++ b/ash/common/system/update/tray_update_unittest.cc
@@ -2,11 +2,10 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/system/tray_update.h"
+#include "ash/common/system/update/tray_update.h"
#include "ash/common/system/tray/wm_system_tray_notifier.h"
#include "ash/common/wm_shell.h"
-#include "ash/shell.h"
#include "ash/system/tray/system_tray.h"
#include "ash/test/ash_test_base.h"
#include "ash/test/test_system_tray_delegate.h"
@@ -19,8 +18,7 @@ using TrayUpdateTest = test::AshTestBase;
// Tests that the update icon becomes visible when an update becomes
// available.
TEST_F(TrayUpdateTest, VisibilityAfterUpdate) {
- TrayUpdate* tray_update =
- Shell::GetInstance()->GetPrimarySystemTray()->GetTrayUpdateForTesting();
+ TrayUpdate* tray_update = GetPrimarySystemTray()->GetTrayUpdateForTesting();
// The system starts with no update pending.
test::TestSystemTrayDelegate* tray_delegate = GetSystemTrayDelegate();
« no previous file with comments | « ash/common/system/update/tray_update.cc ('k') | ash/system/tray/system_tray.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698