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

chrome/browser/chromeos/system/tray_accessibility_browsertest.cc

 // Copyright (c) 2012 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/accessibility_types.h"
 #include "ash/common/login_status.h"
-#include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/system/tray/system_tray.h"
 #include "ash/common/system/tray_accessibility.h"
 #include "ash/common/test/test_session_state_delegate.h"
 #include "ash/magnifier/magnification_controller.h"
 #include "ash/shell.h"
 #include "ash/test/shell_test_api.h"
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 215 matching lines @@
 
   bool IsAutoclickMenuShownOnDetailMenu() const {
     return tray()->detailed_menu_->autoclick_view_;
   }
 
   bool IsVirtualKeyboardMenuShownOnDetailMenu() const {
     return tray()->detailed_menu_->virtual_keyboard_view_;
   }
 
   // In material design we show the help button but theme it as disabled if
-  // it is not possible to load the the help page.
+  // it is not possible to load the help page.
   bool IsHelpAvailableOnDetailMenu() const {
-    if (ash::MaterialDesignController::IsSystemTrayMenuMaterial()) {
-      return tray()->detailed_menu_->help_view_->state() ==
-             views::Button::STATE_NORMAL;
-    }
-    return tray()->detailed_menu_->help_view_;
+    return tray()->detailed_menu_->help_view_->state() ==
+           views::Button::STATE_NORMAL;
   }
 
   // In material design we show the settings button but theme it as disabled if
-  // it is not possible to load the the settings page.
+  // it is not possible to load the settings page.
   bool IsSettingsAvailableOnDetailMenu() const {
-    if (ash::MaterialDesignController::IsSystemTrayMenuMaterial()) {
-      return tray()->detailed_menu_->settings_view_->state() ==
-             views::Button::STATE_NORMAL;
-    }
-    return tray()->detailed_menu_->settings_view_;
+    return tray()->detailed_menu_->settings_view_->state() ==
+           views::Button::STATE_NORMAL;
   }
 
   bool IsNotificationShown() const {
     return (tray()->detailed_popup_ &&
             !tray()->detailed_popup_->GetWidget()->IsClosed());
   }
 
   base::string16 GetNotificationText() const {
     if (IsNotificationShown())
       return tray()->detailed_popup_->label_for_test()->text();
@@ skipping 644 matching lines @@
   EXPECT_FALSE(IsSettingsAvailableOnDetailMenu());
   CloseDetailMenu();
 }
 
 INSTANTIATE_TEST_CASE_P(TrayAccessibilityTestInstance,
                         TrayAccessibilityTest,
                         testing::Values(PREF_SERVICE,
                                         POLICY));
 
 }  // namespace chromeos