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

Unified Diff: chrome/browser/chromeos/shutdown_policy_browsertest.cc

Issue 2682393004: Remove non-MD test coverage from tests in chrome/browser/chromeos/ (Closed)
Patch Set: 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: chrome/browser/chromeos/shutdown_policy_browsertest.cc
diff --git a/chrome/browser/chromeos/shutdown_policy_browsertest.cc b/chrome/browser/chromeos/shutdown_policy_browsertest.cc
index 50dbf70f988ddb2caa08925a9eb74237f4f2655e..ec37e718c297635f310acfcd83839da6556d07fd 100644
--- a/chrome/browser/chromeos/shutdown_policy_browsertest.cc
+++ b/chrome/browser/chromeos/shutdown_policy_browsertest.cc
@@ -6,7 +6,6 @@
#include <string>
#include "ash/common/login_status.h"
-#include "ash/common/material_design/material_design_controller.h"
#include "ash/common/strings/grit/ash_strings.h"
#include "ash/common/system/date/date_default_view.h"
#include "ash/common/system/date/tray_date.h"
@@ -160,12 +159,7 @@ class ShutdownPolicyInSessionTest
// Gets the shutdown button view.
const views::View* GetShutdownButton() {
ash::SystemTray* tray = ash::Shell::GetInstance()->GetPrimarySystemTray();
- if (ash::MaterialDesignController::IsSystemTrayMenuMaterial()) {
- return tray->GetTrayTilesForTesting()
- ->GetDefaultViewForTesting()
- ->GetShutdownButtonViewForTest();
- }
- return tray->GetTrayDateForTesting()
+ return tray->GetTrayTilesForTesting()
->GetDefaultViewForTesting()
->GetShutdownButtonViewForTest();
}

Powered by Google App Engine
This is Rietveld 408576698