Merge 2277753006 into M54.

ash/test/test_system_tray_delegate.h

 // Copyright 2013 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.
 
 #ifndef ASH_TEST_TEST_SYSTEM_TRAY_DELEGATE_H_
 #define ASH_TEST_TEST_SYSTEM_TRAY_DELEGATE_H_
 
 #include "ash/common/system/tray/default_system_tray_delegate.h"
 #include "ash/common/system/tray/ime_info.h"
 #include "base/macros.h"
@@ skipping 33 matching lines @@
   // Updates the session length limit so that the limit will come from now in
   // |new_limit|.
   void SetSessionLengthLimitForTest(const base::TimeDelta& new_limit);
 
   // Clears the session length limit.
   void ClearSessionLengthLimit();
 
   // Sets the IME info.
   void SetCurrentIME(const IMEInfo& info);
 
+  // Sets the list of available IMEs.
+  void SetAvailableIMEList(const IMEInfoList& list);
+
   // Overridden from SystemTrayDelegate:
   LoginStatus GetUserLoginStatus() const override;
   bool IsUserSupervised() const override;
   void GetSystemUpdateInfo(UpdateInfo* info) const override;
   bool ShouldShowDisplayNotification() override;
   bool GetSessionStartTime(base::TimeTicks* session_start_time) override;
   bool GetSessionLengthLimit(base::TimeDelta* session_length_limit) override;
   void SignOut() override;
   std::unique_ptr<SystemTrayItem> CreateDisplayTrayItem(
       SystemTray* tray) override;
   std::unique_ptr<SystemTrayItem> CreateRotationLockTrayItem(
       SystemTray* tray) override;
   void GetCurrentIME(IMEInfo* info) override;
+  void GetAvailableIMEList(IMEInfoList* list) override;
 
  private:
   bool should_show_display_notification_;
   LoginStatus login_status_;
   base::TimeDelta session_length_limit_;
   bool session_length_limit_set_;
   IMEInfo current_ime_;
+  IMEInfoList ime_list_;
 
   DISALLOW_COPY_AND_ASSIGN(TestSystemTrayDelegate);
 };
 
 }  // namespace test
 }  // namespace ash
 
 #endif  // ASH_TEST_TEST_SYSTEM_TRAY_DELEGATE_H_