chromeos: Make ash system tray directly observe IME state changes

chrome/browser/chromeos/input_method/input_method_manager_impl_unittest.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 "chrome/browser/chromeos/input_method/input_method_manager_impl.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <memory>
@@ skipping 118 matching lines @@
   }
   ~InputMethodManagerImplTest() override {}
 
   void SetUp() override {
     profile_manager_.reset(new TestingProfileManager(GetBrowserProcess()));
     ASSERT_TRUE(profile_manager_->SetUp());
 
     ui::InitializeInputMethodForTesting();
 
     delegate_ = new FakeInputMethodDelegate();
-    manager_.reset(new InputMethodManagerImpl(
-        std::unique_ptr<InputMethodDelegate>(delegate_), false));
+    manager_ = new InputMethodManagerImpl(
+        std::unique_ptr<InputMethodDelegate>(delegate_), false);
+    InputMethodManager::Initialize(manager_);  // Takes ownership.
     manager_->GetInputMethodUtil()->UpdateHardwareLayoutCache();
     candidate_window_controller_ = new MockCandidateWindowController;
     manager_->SetCandidateWindowControllerForTesting(
         candidate_window_controller_);
     keyboard_ = new FakeImeKeyboard;
     manager_->SetImeKeyboardForTesting(keyboard_);
     mock_engine_handler_.reset(new MockInputMethodEngine());
     ui::IMEBridge::Initialize();
     ui::IMEBridge::Get()->SetCurrentEngineHandler(mock_engine_handler_.get());
 
     menu_manager_ = ui::ime::InputMethodMenuManager::GetInstance();
 
     InitImeList();
 
     BrowserWithTestWindowTest::SetUp();
   }
 
   void TearDown() override {
     BrowserWithTestWindowTest::TearDown();
 
     ui::ShutdownInputMethodForTesting();
 
     delegate_ = NULL;
     candidate_window_controller_ = NULL;
     keyboard_ = NULL;
-    manager_.reset();
+    InputMethodManager::Shutdown();
+    manager_ = nullptr;
 
     profile_manager_.reset();
   }
 
  protected:
   // Helper function to initialize component extension stuff for testing.
   void InitComponentExtension() {
     mock_delegate_ = new MockComponentExtIMEManagerDelegate();
     mock_delegate_->set_ime_list(ime_list_);
     std::unique_ptr<ComponentExtensionIMEManagerDelegate> delegate(
@@ skipping 166 matching lines @@
     ext2.engines.push_back(ext2_engine2);
 
     ime_list_.push_back(ext2);
   }
 
   TestingBrowserProcess* GetBrowserProcess() {
     return TestingBrowserProcess::GetGlobal();
   }
 
   std::unique_ptr<TestingProfileManager> profile_manager_;
-  std::unique_ptr<InputMethodManagerImpl> manager_;
+  InputMethodManagerImpl* manager_;  // Owned by InputMethodManager.
   FakeInputMethodDelegate* delegate_;
   MockCandidateWindowController* candidate_window_controller_;
   std::unique_ptr<MockInputMethodEngine> mock_engine_handler_;
   FakeImeKeyboard* keyboard_;
   MockComponentExtIMEManagerDelegate* mock_delegate_;
   std::vector<ComponentExtensionIME> ime_list_;
   ui::ime::InputMethodMenuManager* menu_manager_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(InputMethodManagerImplTest);
@@ skipping 462 matching lines @@
   EXPECT_EQ("us(dvorak)", keyboard_->last_layout_);
   // Disable Dvorak.
   ids.erase(ids.begin());
   EXPECT_TRUE(manager_->GetActiveIMEState()->ReplaceEnabledInputMethods(ids));
   EXPECT_EQ(3U, manager_->GetActiveIMEState()->GetNumActiveInputMethods());
   EXPECT_EQ(7, keyboard_->set_current_keyboard_layout_by_name_count_);
   EXPECT_EQ("us(colemak)", keyboard_->last_layout_);
 }
 
 TEST_F(InputMethodManagerImplTest, TestActivateInputMethodMenuItem) {
+  // Activating a menu item triggers observers in ash that assume
+  // GetActiveIMEState() is not null.
+  manager_->SetState(manager_->CreateNewState(nullptr));
+  ui::IMEBridge::Get()->SetCurrentEngineHandler(mock_engine_handler_.get());
+
   const std::string kKey = "key";
   ui::ime::InputMethodMenuItemList menu_list;
   menu_list.push_back(ui::ime::InputMethodMenuItem(
       kKey, "label", false, false));
   menu_manager_->SetCurrentInputMethodMenuItemList(menu_list);
 
   manager_->ActivateInputMethodMenuItem(kKey);
   EXPECT_EQ(kKey, mock_engine_handler_->last_activated_property());
 
   // Key2 is not registered, so activated property should not be changed.
@@ skipping 709 matching lines @@
   EXPECT_TRUE(manager_->GetActiveIMEState()->SetAllowedInputMethods(allowed));
   manager_->GetActiveIMEState()->SetInputMethodLoginDefault();
   EXPECT_THAT(manager_->GetActiveIMEState()->GetActiveInputMethodIds(),
               testing::ElementsAre(ImeIdFromEngineId("xkb:us::eng"),
                                    ImeIdFromEngineId("xkb:de::ger"),
                                    ImeIdFromEngineId("xkb:fr::fra")));
 }
 
 }  // namespace input_method
 }  // namespace chromeos