[Merge to M57] Remove non-MD test coverage from chrome/browser/ui/

chrome/browser/ui/ash/system_tray_delegate_chromeos_browsertest_chromeos.cc

Index: chrome/browser/ui/ash/system_tray_delegate_chromeos_browsertest_chromeos.cc
diff --git a/chrome/browser/ui/ash/system_tray_delegate_chromeos_browsertest_chromeos.cc b/chrome/browser/ui/ash/system_tray_delegate_chromeos_browsertest_chromeos.cc
index b061e67fa5f22e9da1576509914f31c3fd98d10b..a64eb66e65d4eb7e6d5e960d9c495791bfed8220 100644
--- a/chrome/browser/ui/ash/system_tray_delegate_chromeos_browsertest_chromeos.cc
+++ b/chrome/browser/ui/ash/system_tray_delegate_chromeos_browsertest_chromeos.cc
@@ -6,7 +6,6 @@
 
 #include <string>
 
-#include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/system/date/date_default_view.h"
 #include "ash/common/system/date/date_view.h"
 #include "ash/common/system/date/system_info_default_view.h"
@@ -38,39 +37,22 @@ const char kUser1[] = "user1@gmail.com";
 const char kUser2[] = "user2@gmail.com";
 
 base::HourClockType GetHourType() {
-  if (ash::MaterialDesignController::IsSystemTrayMenuMaterial()) {
-    const ash::TraySystemInfo* tray_system_info =
-        ash::Shell::GetInstance()
-            ->GetPrimarySystemTray()
-            ->GetTraySystemInfoForTesting();
-    const ash::SystemInfoDefaultView* system_info_default_view =
-        tray_system_info->GetDefaultViewForTesting();
-
-    return system_info_default_view->GetDateView()->GetHourTypeForTesting();
-  }
-
-  const ash::TrayDate* tray_date = ash::Shell::GetInstance()
-                                       ->GetPrimarySystemTray()
-                                       ->GetTrayDateForTesting();
-  const ash::DateDefaultView* date_default_view =
-      tray_date->GetDefaultViewForTesting();
-
-  return date_default_view->GetDateView()->GetHourTypeForTesting();
+  const ash::TraySystemInfo* tray_system_info =
+      ash::Shell::GetInstance()
+          ->GetPrimarySystemTray()
+          ->GetTraySystemInfoForTesting();
+  const ash::SystemInfoDefaultView* system_info_default_view =
+      tray_system_info->GetDefaultViewForTesting();
+
+  return system_info_default_view->GetDateView()->GetHourTypeForTesting();
 }
 
 void CreateDefaultView() {
-  if (ash::MaterialDesignController::IsSystemTrayMenuMaterial()) {
-    ash::TraySystemInfo* tray_system_info = ash::Shell::GetInstance()
-                                                ->GetPrimarySystemTray()
-                                                ->GetTraySystemInfoForTesting();
-    tray_system_info->CreateDefaultViewForTesting(
-        ash::LoginStatus::NOT_LOGGED_IN);
-  } else {
-    ash::TrayDate* tray_date = ash::Shell::GetInstance()
-                                   ->GetPrimarySystemTray()
-                                   ->GetTrayDateForTesting();
-    tray_date->CreateDefaultViewForTesting(ash::LoginStatus::NOT_LOGGED_IN);
-  }
+  ash::TraySystemInfo* tray_system_info = ash::Shell::GetInstance()
+                                              ->GetPrimarySystemTray()
+                                              ->GetTraySystemInfoForTesting();
+  tray_system_info->CreateDefaultViewForTesting(
+      ash::LoginStatus::NOT_LOGGED_IN);
 }
 
 }  // namespace