Remove non-MD test coverage from tests in chrome/browser/chromeos/

chrome/browser/chromeos/policy/device_system_use_24hour_clock_browsertest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/common/login_status.h"
-#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"
 #include "ash/common/system/date/tray_system_info.h"
 #include "ash/common/system/tray/system_tray.h"
 #include "ash/common/wm_shell.h"
 #include "ash/shell.h"
 #include "base/command_line.h"
 #include "base/location.h"
 #include "base/macros.h"
@@ skipping 53 matching lines @@
     run_loop.Run();
   }
 
   static bool SystemClockShouldUse24Hour() {
     return g_browser_process->platform_part()
         ->GetSystemClock()
         ->ShouldUse24HourClock();
   }
 
   static base::HourClockType TestGetPrimarySystemTrayTimeHourType() {
-    if (ash::MaterialDesignController::IsSystemTrayMenuMaterial()) {
-      const ash::TraySystemInfo* tray_system_info =
-          ash::Shell::GetInstance()
-              ->GetPrimarySystemTray()
-              ->GetTraySystemInfoForTesting();
-      const ash::tray::TimeView* time_tray =
-          tray_system_info->GetTimeTrayForTesting();
-
-      return time_tray->GetHourTypeForTesting();
-    }
-
-    const ash::TrayDate* tray_date = ash::Shell::GetInstance()
-                                         ->GetPrimarySystemTray()
-                                         ->GetTrayDateForTesting();
-    const ash::tray::TimeView* time_tray = tray_date->GetTimeTrayForTesting();
+    const ash::TraySystemInfo* tray_system_info =
+        ash::Shell::GetInstance()
+            ->GetPrimarySystemTray()
+            ->GetTraySystemInfoForTesting();
+    const ash::tray::TimeView* time_tray =
+        tray_system_info->GetTimeTrayForTesting();
 
     return time_tray->GetHourTypeForTesting();
   }
 
   static bool TestPrimarySystemTrayHasDateDefaultView() {
-    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 != nullptr;
-    }
-
-    const ash::TrayDate* tray_date = ash::Shell::GetInstance()
-                                         ->GetPrimarySystemTray()
-                                         ->GetTrayDateForTesting();
-    const ash::DateDefaultView* date_default_view =
-        tray_date->GetDefaultViewForTesting();
-    return date_default_view != nullptr;
+    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 != nullptr;
   }
 
   static void TestPrimarySystemTrayCreateDefaultView() {
-    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);
   }
 
   static base::HourClockType TestGetPrimarySystemTrayDateHourType() {
-    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();
+    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();
+    return system_info_default_view->GetDateView()->GetHourTypeForTesting();
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(SystemUse24HourClockPolicyTest);
 };
 
 IN_PROC_BROWSER_TEST_F(SystemUse24HourClockPolicyTest, CheckUnset) {
   bool system_use_24hour_clock;
   EXPECT_FALSE(CrosSettings::Get()->GetBoolean(kSystemUse24HourClock,
                                                &system_use_24hour_clock));
@@ skipping 51 matching lines @@
   EXPECT_TRUE(CrosSettings::Get()->GetBoolean(kSystemUse24HourClock,
                                               &system_use_24hour_clock));
   EXPECT_FALSE(system_use_24hour_clock);
   EXPECT_FALSE(SystemClockShouldUse24Hour());
   EXPECT_EQ(base::k12HourClock, TestGetPrimarySystemTrayTimeHourType());
   EXPECT_TRUE(TestPrimarySystemTrayHasDateDefaultView());
   EXPECT_EQ(base::k12HourClock, TestGetPrimarySystemTrayDateHourType());
 }
 
 }  // namespace chromeos