Enable tests in TrayIMETest for MD

ash/common/system/ime/tray_ime_chromeos_unittest.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/system/ime/tray_ime_chromeos.h"
 
 #include "ash/common/accessibility_delegate.h"
 #include "ash/common/accessibility_types.h"
+#include "ash/common/system/chromeos/ime_menu/ime_list_view.h"
 #include "ash/common/system/tray/system_tray_notifier.h"
-#include "ash/common/system/tray/tray_details_view.h"
 #include "ash/common/wm_shell.h"
 #include "ash/test/ash_test_base.h"
-#include "base/command_line.h"
 #include "ui/events/devices/device_data_manager.h"
 #include "ui/keyboard/keyboard_util.h"
 
 namespace ash {
 
 class TrayIMETest : public test::AshTestBase {
  public:
   TrayIMETest() {}
   ~TrayIMETest() override {}
 
-  TrayIME* tray() { return tray_.get(); }
+  views::View* default_view() const { return default_view_.get(); }
 
-  views::View* default_view() { return default_view_.get(); }
-
-  views::View* detailed_view() { return detailed_view_.get(); }
+  views::View* detailed_view() const { return detailed_view_.get(); }
 
   // Mocks enabling the a11y virtual keyboard since the actual a11y manager
   // is not created in ash tests.
   void SetAccessibilityKeyboardEnabled(bool enabled);
 
   // Sets the current number of active IMEs.
   void SetIMELength(int length);
 
-  // Returns the view in the detailed views scroll content at the provided
-  // index.
-  views::View* GetScrollChildView(int index);
+  // Returns the view responsible for toggling virtual keyboard.
+  views::View* GetToggleView() const;
 
   void SuppressKeyboard();
   void RestoreKeyboard();
 
   // test::AshTestBase:
   void SetUp() override;
   void TearDown() override;
 
  private:
   std::unique_ptr<TrayIME> tray_;
@@ skipping 18 matching lines @@
 
 void TrayIMETest::SetIMELength(int length) {
   tray_->ime_list_.clear();
   IMEInfo ime;
   for (int i = 0; i < length; i++) {
     tray_->ime_list_.push_back(ime);
   }
   tray_->Update();
 }
 
-views::View* TrayIMETest::GetScrollChildView(int index) {
-  TrayDetailsView* details = static_cast<TrayDetailsView*>(detailed_view());
-  views::View* content = details->scroll_content();
-  EXPECT_TRUE(content);
-  EXPECT_GT(content->child_count(), index);
-  return content->child_at(index);
+views::View* TrayIMETest::GetToggleView() const {
+  ImeListViewTestApi test_api(static_cast<ImeListView*>(detailed_view()));
+  return test_api.GetToggleView();
 }
 
 void TrayIMETest::SuppressKeyboard() {
   DCHECK(!keyboard_suppressed_);
   keyboard_suppressed_ = true;
 
   ui::DeviceDataManager* device_manager = ui::DeviceDataManager::GetInstance();
   touchscreen_devices_to_restore_ = device_manager->GetTouchscreenDevices();
   keyboard_devices_to_restore_ = device_manager->GetKeyboardDevices();
 
@@ skipping 32 matching lines @@
   SetAccessibilityKeyboardEnabled(false);
   tray_.reset();
   default_view_.reset();
   detailed_view_.reset();
   test::AshTestBase::TearDown();
 }
 
 // Tests that if the keyboard is not suppressed the default view is hidden
 // if less than 2 IMEs are present.
 TEST_F(TrayIMETest, HiddenWithNoIMEs) {
-  if (MaterialDesignController::IsSystemTrayMenuMaterial())
-    return;
-
   SetIMELength(0);
   EXPECT_FALSE(default_view()->visible());
   SetIMELength(1);
   EXPECT_FALSE(default_view()->visible());
   SetIMELength(2);
   EXPECT_TRUE(default_view()->visible());
 }
 
 // Tests that if no IMEs are present the default view is hidden when a11y is
 // enabled.
 TEST_F(TrayIMETest, HidesOnA11yEnabled) {
-  if (MaterialDesignController::IsSystemTrayMenuMaterial())
-    return;
-
   SetIMELength(0);
   SuppressKeyboard();
   EXPECT_TRUE(default_view()->visible());
   // Enable a11y keyboard.
   SetAccessibilityKeyboardEnabled(true);
   EXPECT_FALSE(default_view()->visible());
   // Disable the a11y keyboard.
   SetAccessibilityKeyboardEnabled(false);
   EXPECT_TRUE(default_view()->visible());
 }
 
 // Tests that clicking on the keyboard toggle causes the virtual keyboard
 // to toggle between enabled and disabled.
 TEST_F(TrayIMETest, PerformActionOnDetailedView) {
-  if (MaterialDesignController::IsSystemTrayMenuMaterial())
-    return;
-
   SetIMELength(0);
   SuppressKeyboard();
   EXPECT_FALSE(keyboard::IsKeyboardEnabled());
-  views::View* toggle = GetScrollChildView(0);
+  views::View* toggle = GetToggleView();
   ui::GestureEvent tap(0, 0, 0, base::TimeTicks(),
                        ui::GestureEventDetails(ui::ET_GESTURE_TAP));
   // Enable the keyboard.
   toggle->OnGestureEvent(&tap);
   EXPECT_TRUE(keyboard::IsKeyboardEnabled());
   EXPECT_TRUE(default_view()->visible());
-  // With no IMEs the toggle should be the first child.
-  toggle = GetScrollChildView(0);
+
   // Clicking again should disable the keyboard.
+  toggle = GetToggleView();
   tap = ui::GestureEvent(0, 0, 0, base::TimeTicks(),
                          ui::GestureEventDetails(ui::ET_GESTURE_TAP));
   toggle->OnGestureEvent(&tap);
   EXPECT_FALSE(keyboard::IsKeyboardEnabled());
   EXPECT_TRUE(default_view()->visible());
 }
 
 }  // namespace ash