Enable tests in TrayIMETest for MD

ash/common/system/chromeos/ime_menu/ime_list_view.cc

 // Copyright 2016 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/chromeos/ime_menu/ime_list_view.h"
 
 #include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/system/tray/hover_highlight_view.h"
 #include "ash/common/system/tray/ime_info.h"
 #include "ash/common/system/tray/system_menu_button.h"
@@ skipping 162 matching lines @@
 class MaterialKeyboardStatusRowView : public views::View {
  public:
   MaterialKeyboardStatusRowView(views::ButtonListener* listener, bool enabled)
       : listener_(listener), toggle_(nullptr) {
     Init();
     toggle_->SetIsOn(enabled, false);
   }
 
   ~MaterialKeyboardStatusRowView() override {}
 
-  const views::Button* toggle() const { return toggle_; }
+  views::Button* toggle() const { return toggle_; }
   bool is_toggled() const { return toggle_->is_on(); }
 
  protected:
   // views::View:
   int GetHeightForWidth(int w) const override {
     return GetPreferredSize().height();
   }
 
  private:
   void Init() {
@@ skipping 254 matching lines @@
   }
 
   for (auto property_map : property_map_) {
     if (property_map.second == last_selected_item_id_) {
       (property_map.first)->RequestFocus();
       return;
     }
   }
 }
 
+ImeListViewTestApi::ImeListViewTestApi(ImeListView* ime_list_view)
+    : ime_list_view_(ime_list_view) {}
+
+ImeListViewTestApi::~ImeListViewTestApi() {}
+
+views::View* ImeListViewTestApi::GetToggleView() const {
+  if (MaterialDesignController::IsSystemTrayMenuMaterial())
+    return ime_list_view_->material_keyboard_status_view_->toggle();
+
+  return ime_list_view_->keyboard_status_;

[tdanderson, 2017/02/07 23:27:57]

Since none of the tests are being run in non-MD anymore (the trybots don't run
them and we are no longer expecting local ToT builds with --ash-md=disabled to
work at all) then I think we should be able to remove lines 464 and 467?

[mohsen, 2017/02/08 02:13:50]

Right. Done.

+}
+
 }  // namespace ash