| Index: ash/common/system/ime/tray_ime_chromeos_unittest.cc | 
| diff --git a/ash/common/system/ime/tray_ime_chromeos_unittest.cc b/ash/common/system/ime/tray_ime_chromeos_unittest.cc | 
| deleted file mode 100644 | 
| index fb6e8bc05f09ed54a888247d8b74d32e8630a725..0000000000000000000000000000000000000000 | 
| --- a/ash/common/system/ime/tray_ime_chromeos_unittest.cc | 
| +++ /dev/null | 
| @@ -1,204 +0,0 @@ | 
| -// 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/wm_shell.h" | 
| -#include "ash/test/ash_test_base.h" | 
| -#include "base/strings/utf_string_conversions.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 {} | 
| - | 
| -  views::View* default_view() const { return default_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 responsible for toggling virtual keyboard. | 
| -  views::View* GetToggleView() const; | 
| - | 
| -  // Sets the managed IMEs tooltip message (and thus also if IMEs are managed = | 
| -  // non-empty or not = empty) | 
| -  void SetManagedMessage(base::string16 managed_message); | 
| - | 
| -  void SuppressKeyboard(); | 
| -  void RestoreKeyboard(); | 
| - | 
| -  // test::AshTestBase: | 
| -  void SetUp() override; | 
| -  void TearDown() override; | 
| - | 
| - private: | 
| -  std::unique_ptr<TrayIME> tray_; | 
| -  std::unique_ptr<views::View> default_view_; | 
| -  std::unique_ptr<views::View> detailed_view_; | 
| - | 
| -  bool keyboard_suppressed_ = false; | 
| -  std::vector<ui::TouchscreenDevice> touchscreen_devices_to_restore_; | 
| -  std::vector<ui::InputDevice> keyboard_devices_to_restore_; | 
| - | 
| -  DISALLOW_COPY_AND_ASSIGN(TrayIMETest); | 
| -}; | 
| - | 
| -void TrayIMETest::SetAccessibilityKeyboardEnabled(bool enabled) { | 
| -  WmShell::Get()->accessibility_delegate()->SetVirtualKeyboardEnabled(enabled); | 
| -  keyboard::SetAccessibilityKeyboardEnabled(enabled); | 
| -  AccessibilityNotificationVisibility notification = | 
| -      enabled ? A11Y_NOTIFICATION_SHOW : A11Y_NOTIFICATION_NONE; | 
| -  WmShell::Get()->system_tray_notifier()->NotifyAccessibilityModeChanged( | 
| -      notification); | 
| -} | 
| - | 
| -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::GetToggleView() const { | 
| -  ImeListViewTestApi test_api(static_cast<ImeListView*>(detailed_view())); | 
| -  return test_api.GetToggleView(); | 
| -} | 
| - | 
| -void TrayIMETest::SetManagedMessage(base::string16 managed_message) { | 
| -  tray_->ime_managed_message_ = managed_message; | 
| -  tray_->Update(); | 
| -} | 
| - | 
| -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(); | 
| - | 
| -  ui::DeviceHotplugEventObserver* manager = | 
| -      ui::DeviceDataManager::GetInstance(); | 
| -  std::vector<ui::TouchscreenDevice> screens; | 
| -  screens.push_back( | 
| -      ui::TouchscreenDevice(1, ui::InputDeviceType::INPUT_DEVICE_INTERNAL, | 
| -                            "Touchscreen", gfx::Size(1024, 768), 0)); | 
| -  manager->OnTouchscreenDevicesUpdated(screens); | 
| - | 
| -  std::vector<ui::InputDevice> keyboards; | 
| -  keyboards.push_back(ui::InputDevice( | 
| -      2, ui::InputDeviceType::INPUT_DEVICE_EXTERNAL, "keyboard")); | 
| -  manager->OnKeyboardDevicesUpdated(keyboards); | 
| -} | 
| - | 
| -void TrayIMETest::RestoreKeyboard() { | 
| -  DCHECK(keyboard_suppressed_); | 
| -  ui::DeviceHotplugEventObserver* manager = | 
| -      ui::DeviceDataManager::GetInstance(); | 
| -  manager->OnTouchscreenDevicesUpdated(touchscreen_devices_to_restore_); | 
| -  manager->OnKeyboardDevicesUpdated(keyboard_devices_to_restore_); | 
| -} | 
| - | 
| -void TrayIMETest::SetUp() { | 
| -  test::AshTestBase::SetUp(); | 
| -  tray_.reset(new TrayIME(GetPrimarySystemTray())); | 
| -  default_view_.reset(tray_->CreateDefaultView(LoginStatus::USER)); | 
| -  detailed_view_.reset(tray_->CreateDetailedView(LoginStatus::USER)); | 
| -} | 
| - | 
| -void TrayIMETest::TearDown() { | 
| -  if (keyboard_suppressed_) | 
| -    RestoreKeyboard(); | 
| -  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) { | 
| -  SetIMELength(0); | 
| -  EXPECT_FALSE(default_view()->visible()); | 
| -  SetIMELength(1); | 
| -  EXPECT_FALSE(default_view()->visible()); | 
| -  SetIMELength(2); | 
| -  EXPECT_TRUE(default_view()->visible()); | 
| -} | 
| - | 
| -// Tests that if IMEs are managed, the default view is displayed even for a | 
| -// single IME. | 
| -TEST_F(TrayIMETest, ShownWithSingleIMEWhenManaged) { | 
| -  SetManagedMessage(base::ASCIIToUTF16("managed")); | 
| -  SetIMELength(0); | 
| -  EXPECT_FALSE(default_view()->visible()); | 
| -  SetIMELength(1); | 
| -  EXPECT_TRUE(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) { | 
| -  // TODO: investigate failure in mash. http://crbug.com/695561. | 
| -  if (WmShell::Get()->IsRunningInMash()) | 
| -    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) { | 
| -  // TODO: investigate failure in mash. http://crbug.com/695561. | 
| -  if (WmShell::Get()->IsRunningInMash()) | 
| -    return; | 
| - | 
| -  SetIMELength(0); | 
| -  SuppressKeyboard(); | 
| -  EXPECT_FALSE(keyboard::IsKeyboardEnabled()); | 
| -  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()); | 
| - | 
| -  // 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 | 
|  |