Remove non-MD test coverage from chrome/browser/ui/

chrome/browser/ui/ash/system_tray_delegate_chromeos_browsertest_chromeos.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 "chrome/browser/ui/ash/system_tray_delegate_chromeos.h"
 
 #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"
 #include "ash/common/system/date/tray_date.h"
 #include "ash/common/system/date/tray_system_info.h"
 #include "ash/common/system/tray/system_tray.h"
 #include "ash/shell.h"
 #include "base/macros.h"
 #include "chrome/browser/chromeos/login/login_manager_test.h"
 #include "chrome/browser/chromeos/login/session/user_session_manager.h"
@@ skipping 11 matching lines @@
 
 namespace {
 
 // Because policy is not needed this test it is better to use e-mails that
 // are definitely not enterprise. This lets us to avoid faking of policy fetch
 // procedure.
 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();
+  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();
 }
 
 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
 
 class SystemTrayDelegateChromeOSTest : public LoginManagerTest {
  protected:
   SystemTrayDelegateChromeOSTest()
       : LoginManagerTest(false /* should_launch_browser */),
         account_id1_(AccountId::FromUserEmail(kUser1)),
         account_id2_(AccountId::FromUserEmail(kUser2)) {}
@@ skipping 39 matching lines @@
   EXPECT_EQ(base::k12HourClock, GetHourType());
 
   user_manager::UserManager::Get()->SwitchActiveUser(account_id1_);
   // Allow clock setting to be sent to ash over mojo.
   content::RunAllPendingInMessageLoop();
   CreateDefaultView();
   EXPECT_EQ(base::k24HourClock, GetHourType());
 }
 
 }  // namespace chromeos