chromeos: Make ash system tray directly observe IME state changes

ash/system/ime_menu/ime_menu_tray_unittest.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/system/ime_menu/ime_menu_tray.h"
 
 #include "ash/accelerators/accelerator_controller.h"
 #include "ash/accessibility_delegate.h"
 #include "ash/shell.h"
 #include "ash/system/ime/ime_util.h"
 #include "ash/system/ime_menu/ime_list_view.h"
 #include "ash/system/status_area_widget.h"
 #include "ash/system/tray/ime_info.h"
-#include "ash/system/tray/system_tray_notifier.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/status_area_widget_test_helper.h"
 #include "ash/test/test_system_tray_delegate.h"
 #include "base/run_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "ui/accessibility/ax_node_data.h"
 #include "ui/base/ime/chromeos/input_method_manager.h"
 #include "ui/base/ime/chromeos/mock_input_method_manager.h"
 #include "ui/base/ime/ime_bridge.h"
 #include "ui/base/ime/text_input_flags.h"
@@ skipping 29 matching lines @@
 
 class ImeMenuTrayTest : public test::AshTestBase {
  public:
   ImeMenuTrayTest()
       : scoped_current_ime_(&current_ime_),
         scoped_available_ime_list_(&available_ime_list_) {}
   ~ImeMenuTrayTest() override = default;
 
   // test::AshTestBase:
   void SetUp() override {
-    test::AshTestBase::SetUp();
     // Takes ownership.
     InputMethodManager::Initialize(new TestInputMethodManager);
+    test::AshTestBase::SetUp();
   }
   void TearDown() override {
+    test::AshTestBase::TearDown();
     InputMethodManager::Shutdown();
-    test::AshTestBase::TearDown();
   }
 
  protected:
   // Returns true if the IME menu tray is visible.
   bool IsVisible() { return GetTray()->visible(); }
 
   // Returns the label text of the tray.
   const base::string16& GetTrayText() { return GetTray()->label_->text(); }
 
   // Returns true if the background color of the tray is active.
@@ skipping 34 matching lines @@
     return true;
   }
 
   // Focuses in the given type of input context.
   void FocusInInputContext(ui::TextInputType input_type) {
     ui::IMEEngineHandlerInterface::InputContext input_context(
         input_type, ui::TEXT_INPUT_MODE_DEFAULT, ui::TEXT_INPUT_FLAG_NONE);
     ui::IMEBridge::Get()->SetCurrentInputContext(input_context);
   }
 
-  void SetCurrentIme(const IMEInfo& info) { current_ime_ = info; }
+  void SetCurrentIme(const IMEInfo& info) {
+    current_ime_ = info;
+    GetTray()->InputMethodChanged(nullptr, nullptr, false);
+  }
 
   void SetAvailableImeList(const std::vector<IMEInfo>& list) {
     available_ime_list_ = list;
   }
 
  private:
   IMEInfo current_ime_;
   ime_util::ScopedCurrentImeForTesting scoped_current_ime_;
 
   std::vector<IMEInfo> available_ime_list_;
   ime_util::ScopedAvailableImeListForTesting scoped_available_ime_list_;
 
   DISALLOW_COPY_AND_ASSIGN(ImeMenuTrayTest);
 };
 
 // Tests that visibility of IME menu tray should be consistent with the
 // activation of the IME menu.
 TEST_F(ImeMenuTrayTest, ImeMenuTrayVisibility) {
   ASSERT_FALSE(IsVisible());
 
-  Shell::Get()->system_tray_notifier()->NotifyRefreshIMEMenu(true);
+  GetTray()->ImeMenuActivationChanged(true);
   EXPECT_TRUE(IsVisible());
 
-  Shell::Get()->system_tray_notifier()->NotifyRefreshIMEMenu(false);
+  GetTray()->ImeMenuActivationChanged(false);
   EXPECT_FALSE(IsVisible());
 }
 
 // Tests that IME menu tray shows the right info of the current IME.
 TEST_F(ImeMenuTrayTest, TrayLabelTest) {
-  Shell::Get()->system_tray_notifier()->NotifyRefreshIMEMenu(true);
+  GetTray()->ImeMenuActivationChanged(true);
   ASSERT_TRUE(IsVisible());
 
   // Changes the input method to "ime1".
   IMEInfo info1;
   info1.id = "ime1";
   info1.name = UTF8ToUTF16("English");
   info1.medium_name = UTF8ToUTF16("English");
   info1.short_name = UTF8ToUTF16("US");
   info1.third_party = false;
   info1.selected = true;
   SetCurrentIme(info1);
-  Shell::Get()->system_tray_notifier()->NotifyRefreshIME();
   EXPECT_EQ(UTF8ToUTF16("US"), GetTrayText());
 
   // Changes the input method to a third-party IME extension.
   IMEInfo info2;
   info2.id = "ime2";
   info2.name = UTF8ToUTF16("English UK");
   info2.medium_name = UTF8ToUTF16("English UK");
   info2.short_name = UTF8ToUTF16("UK");
   info2.third_party = true;
   info2.selected = true;
   SetCurrentIme(info2);
-  Shell::Get()->system_tray_notifier()->NotifyRefreshIME();
   EXPECT_EQ(UTF8ToUTF16("UK*"), GetTrayText());
 }
 
 // Tests that IME menu tray changes background color when tapped/clicked. And
 // tests that the background color becomes 'inactive' when disabling the IME
 // menu feature. Also makes sure that the shelf won't autohide as long as the
 // IME menu is open.
 TEST_F(ImeMenuTrayTest, PerformAction) {
-  Shell::Get()->system_tray_notifier()->NotifyRefreshIMEMenu(true);
+  GetTray()->ImeMenuActivationChanged(true);
   ASSERT_TRUE(IsVisible());
   ASSERT_FALSE(IsTrayBackgroundActive());
   StatusAreaWidget* status = StatusAreaWidgetTestHelper::GetStatusAreaWidget();
   EXPECT_FALSE(status->ShouldShowShelf());
 
   ui::GestureEvent tap(0, 0, 0, base::TimeTicks(),
                        ui::GestureEventDetails(ui::ET_GESTURE_TAP));
   GetTray()->PerformAction(tap);
   EXPECT_TRUE(IsTrayBackgroundActive());
   EXPECT_TRUE(IsBubbleShown());
 
   // Auto-hidden shelf would be forced to be visible as long as the bubble is
   // open.
   EXPECT_TRUE(status->ShouldShowShelf());
 
   GetTray()->PerformAction(tap);
   EXPECT_FALSE(IsTrayBackgroundActive());
   EXPECT_FALSE(IsBubbleShown());
 
   // If disabling the IME menu feature when the menu tray is activated, the tray
   // element will be deactivated.
   GetTray()->PerformAction(tap);
   EXPECT_TRUE(IsTrayBackgroundActive());
-  Shell::Get()->system_tray_notifier()->NotifyRefreshIMEMenu(false);
+  GetTray()->ImeMenuActivationChanged(false);
   EXPECT_FALSE(IsVisible());
   EXPECT_FALSE(IsBubbleShown());
   EXPECT_FALSE(IsTrayBackgroundActive());
   EXPECT_FALSE(status->ShouldShowShelf());
 }
 
 // Tests that IME menu list updates when changing the current IME. This should
 // only happen by using shortcuts (Ctrl + Space / Ctrl + Shift + Space) to
 // switch IMEs.
 TEST_F(ImeMenuTrayTest, RefreshImeWithListViewCreated) {
@@ skipping 24 matching lines @@
   info3.medium_name = UTF8ToUTF16("Chinese Pinyin");
   info3.short_name = UTF8ToUTF16("拼");
   info3.third_party = false;
   info3.selected = false;
 
   std::vector<IMEInfo> ime_info_list = {info1, info2, info3};
 
   // Simulate switch to IME 1.
   SetAvailableImeList(ime_info_list);
   SetCurrentIme(info1);
-  Shell::Get()->system_tray_notifier()->NotifyRefreshIME();
   EXPECT_EQ(UTF8ToUTF16("US"), GetTrayText());
   EXPECT_TRUE(IsTrayImeListValid(ime_info_list, info1));
 
   // Simulate switch to IME 3.
   ime_info_list[0].selected = false;
   ime_info_list[2].selected = true;
   SetAvailableImeList(ime_info_list);
   SetCurrentIme(info3);
-  Shell::Get()->system_tray_notifier()->NotifyRefreshIME();
   EXPECT_EQ(UTF8ToUTF16("拼"), GetTrayText());
   EXPECT_TRUE(IsTrayImeListValid(ime_info_list, info3));
 
   // Closes the menu before quitting.
   GetTray()->PerformAction(tap);
   EXPECT_FALSE(IsTrayBackgroundActive());
   EXPECT_FALSE(IsBubbleShown());
 }
 
 // Tests that quits Chrome with IME menu openned will not crash.
 TEST_F(ImeMenuTrayTest, QuitChromeWithMenuOpen) {
-  Shell::Get()->system_tray_notifier()->NotifyRefreshIMEMenu(true);
+  GetTray()->ImeMenuActivationChanged(true);
   ASSERT_TRUE(IsVisible());
   ASSERT_FALSE(IsTrayBackgroundActive());
 
   ui::GestureEvent tap(0, 0, 0, base::TimeTicks(),
                        ui::GestureEventDetails(ui::ET_GESTURE_TAP));
   GetTray()->PerformAction(tap);
   EXPECT_TRUE(IsTrayBackgroundActive());
   EXPECT_TRUE(IsBubbleShown());
 }
 
 // Tests using 'Alt+Shift+K' to open the menu.
 TEST_F(ImeMenuTrayTest, TestAccelerator) {
-  Shell::Get()->system_tray_notifier()->NotifyRefreshIMEMenu(true);
+  GetTray()->ImeMenuActivationChanged(true);
   ASSERT_TRUE(IsVisible());
   ASSERT_FALSE(IsTrayBackgroundActive());
 
   Shell::Get()->accelerator_controller()->PerformActionIfEnabled(
       SHOW_IME_MENU_BUBBLE);
   EXPECT_TRUE(IsTrayBackgroundActive());
   EXPECT_TRUE(IsBubbleShown());
 
   ui::GestureEvent tap(0, 0, 0, base::TimeTicks(),
                        ui::GestureEventDetails(ui::ET_GESTURE_TAP));
   GetTray()->PerformAction(tap);
   EXPECT_FALSE(IsTrayBackgroundActive());
   EXPECT_FALSE(IsBubbleShown());
 }
 
 TEST_F(ImeMenuTrayTest, ShowEmojiKeyset) {
-  Shell::Get()->system_tray_notifier()->NotifyRefreshIMEMenu(true);
+  GetTray()->ImeMenuActivationChanged(true);
   ASSERT_TRUE(IsVisible());
   ASSERT_FALSE(IsTrayBackgroundActive());
 
   ui::GestureEvent tap(0, 0, 0, base::TimeTicks(),
                        ui::GestureEventDetails(ui::ET_GESTURE_TAP));
   GetTray()->PerformAction(tap);
   EXPECT_TRUE(IsTrayBackgroundActive());
   EXPECT_TRUE(IsBubbleShown());
 
   AccessibilityDelegate* accessibility_delegate =
@@ skipping 45 matching lines @@
   FocusInInputContext(ui::TEXT_INPUT_TYPE_PASSWORD);
   EXPECT_FALSE(GetTray()->ShouldShowEmojiHandwritingVoiceButtons());
 
   // Lock screen should not show the buttons.
   BlockUserSession(BLOCKED_BY_LOCK_SCREEN);
   FocusInInputContext(ui::TEXT_INPUT_TYPE_TEXT);
   EXPECT_FALSE(GetTray()->ShouldShowEmojiHandwritingVoiceButtons());
 }
 
 }  // namespace ash