| 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();
|
| }
|
|
|