diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn index e9de6ba4dc926..4266e9a6a5bfc 100644 --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn @@ -7180,6 +7180,12 @@ static_library("test_support") { "ash/arc/extensions/fake_arc_support.h", "ash/file_manager/fake_disk_mount_manager.cc", "ash/file_manager/fake_disk_mount_manager.h", + "ash/input_method/mock_candidate_window_controller.cc", + "ash/input_method/mock_candidate_window_controller.h", + "ash/input_method/mock_input_method_engine.cc", + "ash/input_method/mock_input_method_engine.h", + "ash/input_method/mock_input_method_manager_impl.cc", + "ash/input_method/mock_input_method_manager_impl.h", "ash/login/screens/mock_device_disabled_screen_view.cc", "ash/login/screens/mock_device_disabled_screen_view.h", "ash/login/session/user_session_manager_test_api.cc", @@ -7208,12 +7214,6 @@ static_library("test_support") { "ash/policy/enrollment/fake_device_cloud_policy_initializer.h", "ash/policy/external_data/cloud_external_data_manager_base_test_util.cc", "ash/policy/external_data/cloud_external_data_manager_base_test_util.h", - "chromeos/input_method/mock_candidate_window_controller.cc", - "chromeos/input_method/mock_candidate_window_controller.h", - "chromeos/input_method/mock_input_method_engine.cc", - "chromeos/input_method/mock_input_method_engine.h", - "chromeos/input_method/mock_input_method_manager_impl.cc", - "chromeos/input_method/mock_input_method_manager_impl.h", "chromeos/net/network_portal_detector_test_utils.cc", "chromeos/net/network_portal_detector_test_utils.h", "ui/app_list/test/chrome_app_list_test_support.cc", diff --git a/chrome/browser/ash/input_method/assistive_suggester.h b/chrome/browser/ash/input_method/assistive_suggester.h index 8ee976a67d30c..ce8edf914ec7d 100644 --- a/chrome/browser/ash/input_method/assistive_suggester.h +++ b/chrome/browser/ash/input_method/assistive_suggester.h @@ -11,11 +11,11 @@ #include "chrome/browser/ash/input_method/emoji_suggester.h" #include "chrome/browser/ash/input_method/input_method_engine.h" #include "chrome/browser/ash/input_method/input_method_engine_base.h" -#include "chrome/browser/chromeos/input_method/multi_word_suggester.h" -#include "chrome/browser/chromeos/input_method/personal_info_suggester.h" -#include "chrome/browser/chromeos/input_method/suggester.h" -#include "chrome/browser/chromeos/input_method/suggestion_enums.h" -#include "chrome/browser/chromeos/input_method/suggestions_source.h" +#include "chrome/browser/ash/input_method/multi_word_suggester.h" +#include "chrome/browser/ash/input_method/personal_info_suggester.h" +#include "chrome/browser/ash/input_method/suggester.h" +#include "chrome/browser/ash/input_method/suggestion_enums.h" +#include "chrome/browser/ash/input_method/suggestions_source.h" #include "chromeos/services/ime/public/cpp/suggestions.h" namespace chromeos { diff --git a/chrome/browser/ash/input_method/assistive_suggester_unittest.cc b/chrome/browser/ash/input_method/assistive_suggester_unittest.cc index 796c14013c8e0..44bf79ba86c2f 100644 --- a/chrome/browser/ash/input_method/assistive_suggester_unittest.cc +++ b/chrome/browser/ash/input_method/assistive_suggester_unittest.cc @@ -3,12 +3,12 @@ // found in the LICENSE file. #include "chrome/browser/ash/input_method/assistive_suggester.h" -#include "chrome/browser/chromeos/input_method/personal_info_suggester.h" #include "ash/constants/ash_features.h" #include "ash/constants/ash_pref_names.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/scoped_feature_list.h" +#include "chrome/browser/ash/input_method/personal_info_suggester.h" #include "chrome/test/base/testing_profile.h" #include "components/prefs/scoped_user_pref_update.h" #include "content/public/test/browser_task_environment.h" diff --git a/chrome/browser/ash/input_method/assistive_window_controller.h b/chrome/browser/ash/input_method/assistive_window_controller.h index c3851b577a94c..64fa2fad191e6 100644 --- a/chrome/browser/ash/input_method/assistive_window_controller.h +++ b/chrome/browser/ash/input_method/assistive_window_controller.h @@ -9,7 +9,7 @@ #include "base/macros.h" #include "chrome/browser/ash/input_method/assistive_window_properties.h" -#include "chrome/browser/chromeos/input_method/tts_handler.h" +#include "chrome/browser/ash/input_method/tts_handler.h" #include "chrome/browser/chromeos/input_method/ui/assistive_delegate.h" #include "chrome/browser/chromeos/input_method/ui/grammar_suggestion_window.h" #include "chrome/browser/chromeos/input_method/ui/suggestion_window_view.h" diff --git a/chrome/browser/ash/input_method/autocorrect_manager.cc b/chrome/browser/ash/input_method/autocorrect_manager.cc index 9b0ca3e6b549d..b7ba9d3e5938c 100644 --- a/chrome/browser/ash/input_method/autocorrect_manager.cc +++ b/chrome/browser/ash/input_method/autocorrect_manager.cc @@ -9,7 +9,7 @@ #include "base/strings/utf_string_conversions.h" #include "base/time/time.h" #include "chrome/browser/ash/input_method/assistive_window_properties.h" -#include "chrome/browser/chromeos/input_method/suggestion_enums.h" +#include "chrome/browser/ash/input_method/suggestion_enums.h" #include "chrome/browser/ui/ash/keyboard/chrome_keyboard_controller_client.h" #include "chrome/grit/generated_resources.h" #include "ui/base/ime/chromeos/extension_ime_util.h" diff --git a/chrome/browser/ash/input_method/autocorrect_manager.h b/chrome/browser/ash/input_method/autocorrect_manager.h index ff9c9ba11ac9f..016a81e0b1158 100644 --- a/chrome/browser/ash/input_method/autocorrect_manager.h +++ b/chrome/browser/ash/input_method/autocorrect_manager.h @@ -10,7 +10,7 @@ #include "chrome/browser/ash/input_method/assistive_window_controller.h" #include "chrome/browser/ash/input_method/diacritics_insensitive_string_comparator.h" #include "chrome/browser/ash/input_method/input_method_engine_base.h" -#include "chrome/browser/chromeos/input_method/suggestion_handler_interface.h" +#include "chrome/browser/ash/input_method/suggestion_handler_interface.h" namespace chromeos { diff --git a/chrome/browser/ash/input_method/emoji_suggester.h b/chrome/browser/ash/input_method/emoji_suggester.h index 8b01d4117115f..9e55542af389f 100644 --- a/chrome/browser/ash/input_method/emoji_suggester.h +++ b/chrome/browser/ash/input_method/emoji_suggester.h @@ -9,9 +9,9 @@ #include "base/time/time.h" #include "chrome/browser/ash/input_method/input_method_engine_base.h" -#include "chrome/browser/chromeos/input_method/suggester.h" -#include "chrome/browser/chromeos/input_method/suggestion_enums.h" -#include "chrome/browser/chromeos/input_method/suggestion_handler_interface.h" +#include "chrome/browser/ash/input_method/suggester.h" +#include "chrome/browser/ash/input_method/suggestion_enums.h" +#include "chrome/browser/ash/input_method/suggestion_handler_interface.h" #include "chrome/browser/chromeos/input_method/ui/assistive_delegate.h" #include "chromeos/services/ime/public/cpp/suggestions.h" diff --git a/chrome/browser/ash/input_method/fake_suggestion_handler.h b/chrome/browser/ash/input_method/fake_suggestion_handler.h index ce2b971ee7804..468ddde87fbed 100644 --- a/chrome/browser/ash/input_method/fake_suggestion_handler.h +++ b/chrome/browser/ash/input_method/fake_suggestion_handler.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_ASH_INPUT_METHOD_FAKE_SUGGESTION_HANDLER_H_ #include "chrome/browser/ash/input_method/assistive_window_properties.h" -#include "chrome/browser/chromeos/input_method/suggestion_handler_interface.h" +#include "chrome/browser/ash/input_method/suggestion_handler_interface.h" #include "chrome/browser/chromeos/input_method/ui/suggestion_details.h" namespace chromeos { diff --git a/chrome/browser/ash/input_method/grammar_manager.h b/chrome/browser/ash/input_method/grammar_manager.h index cde06d8f622e6..973e6f14820eb 100644 --- a/chrome/browser/ash/input_method/grammar_manager.h +++ b/chrome/browser/ash/input_method/grammar_manager.h @@ -11,8 +11,8 @@ #include "base/timer/timer.h" #include "chrome/browser/ash/input_method/grammar_service_client.h" -#include "chrome/browser/chromeos/input_method/suggestion_handler_interface.h" -#include "chrome/browser/chromeos/input_method/text_utils.h" +#include "chrome/browser/ash/input_method/suggestion_handler_interface.h" +#include "chrome/browser/ash/input_method/text_utils.h" #include "chrome/browser/chromeos/input_method/ui/assistive_delegate.h" #include "chrome/browser/profiles/profile.h" #include "ui/events/event.h" diff --git a/chrome/browser/ash/input_method/input_method_configuration_unittest.cc b/chrome/browser/ash/input_method/input_method_configuration_unittest.cc index c37e61ec0a0ef..9b47d12a1d8dc 100644 --- a/chrome/browser/ash/input_method/input_method_configuration_unittest.cc +++ b/chrome/browser/ash/input_method/input_method_configuration_unittest.cc @@ -4,7 +4,7 @@ #include "chrome/browser/ash/input_method/input_method_configuration.h" -#include "chrome/browser/chromeos/input_method/mock_input_method_manager_impl.h" +#include "chrome/browser/ash/input_method/mock_input_method_manager_impl.h" #include "components/session_manager/core/session_manager.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/ash/input_method/input_method_engine.h b/chrome/browser/ash/input_method/input_method_engine.h index 7edc78b190ddc..08b510feaa4c4 100644 --- a/chrome/browser/ash/input_method/input_method_engine.h +++ b/chrome/browser/ash/input_method/input_method_engine.h @@ -14,7 +14,7 @@ #include "chrome/browser/ash/input_method/assistive_window_properties.h" #include "chrome/browser/ash/input_method/input_method_engine_base.h" -#include "chrome/browser/chromeos/input_method/suggestion_handler_interface.h" +#include "chrome/browser/ash/input_method/suggestion_handler_interface.h" #include "ui/base/ime/candidate_window.h" #include "ui/base/ime/chromeos/ime_engine_handler_interface.h" #include "ui/base/ime/chromeos/input_method_descriptor.h" diff --git a/chrome/browser/ash/input_method/input_method_engine_unittest.cc b/chrome/browser/ash/input_method/input_method_engine_unittest.cc index 5cdf0b078a139..86655d27e3bce 100644 --- a/chrome/browser/ash/input_method/input_method_engine_unittest.cc +++ b/chrome/browser/ash/input_method/input_method_engine_unittest.cc @@ -18,7 +18,7 @@ #include "base/test/task_environment.h" #include "chrome/browser/ash/input_method/input_method_configuration.h" #include "chrome/browser/ash/input_method/input_method_engine_base.h" -#include "chrome/browser/chromeos/input_method/mock_input_method_manager_impl.h" +#include "chrome/browser/ash/input_method/mock_input_method_manager_impl.h" #include "chrome/browser/ui/ash/keyboard/chrome_keyboard_controller_client_test_helper.h" #include "content/public/test/browser_task_environment.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/ash/input_method/input_method_manager_impl_unittest.cc b/chrome/browser/ash/input_method/input_method_manager_impl_unittest.cc index 2a16553f18820..954c08a166f12 100644 --- a/chrome/browser/ash/input_method/input_method_manager_impl_unittest.cc +++ b/chrome/browser/ash/input_method/input_method_manager_impl_unittest.cc @@ -18,8 +18,8 @@ #include "base/run_loop.h" #include "base/test/scoped_feature_list.h" #include "base/test/task_environment.h" -#include "chrome/browser/chromeos/input_method/mock_candidate_window_controller.h" -#include "chrome/browser/chromeos/input_method/mock_input_method_engine.h" +#include "chrome/browser/ash/input_method/mock_candidate_window_controller.h" +#include "chrome/browser/ash/input_method/mock_input_method_engine.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/ui/ash/ime_controller_client_impl.h" #include "chrome/browser/ui/ash/keyboard/chrome_keyboard_controller_client_test_helper.h" diff --git a/chrome/browser/ash/input_method/input_method_persistence_unittest.cc b/chrome/browser/ash/input_method/input_method_persistence_unittest.cc index b6cc2cf9c626e..46ed4ddf681af 100644 --- a/chrome/browser/ash/input_method/input_method_persistence_unittest.cc +++ b/chrome/browser/ash/input_method/input_method_persistence_unittest.cc @@ -6,8 +6,8 @@ #include "base/command_line.h" #include "base/memory/ptr_util.h" +#include "chrome/browser/ash/input_method/mock_input_method_manager_impl.h" #include "chrome/browser/ash/login/users/fake_chrome_user_manager.h" -#include "chrome/browser/chromeos/input_method/mock_input_method_manager_impl.h" #include "chrome/browser/chromeos/language_preferences.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/common/chrome_constants.h" diff --git a/chrome/browser/chromeos/input_method/mock_candidate_window_controller.cc b/chrome/browser/ash/input_method/mock_candidate_window_controller.cc similarity index 93% rename from chrome/browser/chromeos/input_method/mock_candidate_window_controller.cc rename to chrome/browser/ash/input_method/mock_candidate_window_controller.cc index 8bbed86af0639..a200914628a0c 100644 --- a/chrome/browser/chromeos/input_method/mock_candidate_window_controller.cc +++ b/chrome/browser/ash/input_method/mock_candidate_window_controller.cc @@ -2,7 +2,7 @@ // 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/mock_candidate_window_controller.h" +#include "chrome/browser/ash/input_method/mock_candidate_window_controller.h" namespace chromeos { namespace input_method { diff --git a/chrome/browser/chromeos/input_method/mock_candidate_window_controller.h b/chrome/browser/ash/input_method/mock_candidate_window_controller.h similarity index 82% rename from chrome/browser/chromeos/input_method/mock_candidate_window_controller.h rename to chrome/browser/ash/input_method/mock_candidate_window_controller.h index d5ea89effdd0a..429512438724e 100644 --- a/chrome/browser/chromeos/input_method/mock_candidate_window_controller.h +++ b/chrome/browser/ash/input_method/mock_candidate_window_controller.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_CHROMEOS_INPUT_METHOD_MOCK_CANDIDATE_WINDOW_CONTROLLER_H_ -#define CHROME_BROWSER_CHROMEOS_INPUT_METHOD_MOCK_CANDIDATE_WINDOW_CONTROLLER_H_ +#ifndef CHROME_BROWSER_ASH_INPUT_METHOD_MOCK_CANDIDATE_WINDOW_CONTROLLER_H_ +#define CHROME_BROWSER_ASH_INPUT_METHOD_MOCK_CANDIDATE_WINDOW_CONTROLLER_H_ #include "base/macros.h" #include "base/observer_list.h" @@ -40,4 +40,4 @@ class MockCandidateWindowController : public CandidateWindowController { } // namespace input_method } // namespace chromeos -#endif // CHROME_BROWSER_CHROMEOS_INPUT_METHOD_MOCK_CANDIDATE_WINDOW_CONTROLLER_H_ +#endif // CHROME_BROWSER_ASH_INPUT_METHOD_MOCK_CANDIDATE_WINDOW_CONTROLLER_H_ diff --git a/chrome/browser/chromeos/input_method/mock_input_method_engine.cc b/chrome/browser/ash/input_method/mock_input_method_engine.cc similarity index 96% rename from chrome/browser/chromeos/input_method/mock_input_method_engine.cc rename to chrome/browser/ash/input_method/mock_input_method_engine.cc index 5e114e98d4b8b..cf4d30bdb44fc 100644 --- a/chrome/browser/chromeos/input_method/mock_input_method_engine.cc +++ b/chrome/browser/ash/input_method/mock_input_method_engine.cc @@ -3,7 +3,7 @@ // 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/mock_input_method_engine.h" +#include "chrome/browser/ash/input_method/mock_input_method_engine.h" #include diff --git a/chrome/browser/chromeos/input_method/mock_input_method_engine.h b/chrome/browser/ash/input_method/mock_input_method_engine.h similarity index 89% rename from chrome/browser/chromeos/input_method/mock_input_method_engine.h rename to chrome/browser/ash/input_method/mock_input_method_engine.h index 2a3c21229132c..9af6ebcb1c3ea 100644 --- a/chrome/browser/chromeos/input_method/mock_input_method_engine.h +++ b/chrome/browser/ash/input_method/mock_input_method_engine.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_CHROMEOS_INPUT_METHOD_MOCK_INPUT_METHOD_ENGINE_H_ -#define CHROME_BROWSER_CHROMEOS_INPUT_METHOD_MOCK_INPUT_METHOD_ENGINE_H_ +#ifndef CHROME_BROWSER_ASH_INPUT_METHOD_MOCK_INPUT_METHOD_ENGINE_H_ +#define CHROME_BROWSER_ASH_INPUT_METHOD_MOCK_INPUT_METHOD_ENGINE_H_ #include #include @@ -60,4 +60,4 @@ class MockInputMethodEngine : public ui::IMEEngineHandlerInterface { } // namespace chromeos -#endif // CHROME_BROWSER_CHROMEOS_INPUT_METHOD_MOCK_INPUT_METHOD_ENGINE_H_ +#endif // CHROME_BROWSER_ASH_INPUT_METHOD_MOCK_INPUT_METHOD_ENGINE_H_ diff --git a/chrome/browser/chromeos/input_method/mock_input_method_manager_impl.cc b/chrome/browser/ash/input_method/mock_input_method_manager_impl.cc similarity index 98% rename from chrome/browser/chromeos/input_method/mock_input_method_manager_impl.cc rename to chrome/browser/ash/input_method/mock_input_method_manager_impl.cc index 294adb0206abd..51d56c2bdb6c8 100644 --- a/chrome/browser/chromeos/input_method/mock_input_method_manager_impl.cc +++ b/chrome/browser/ash/input_method/mock_input_method_manager_impl.cc @@ -2,7 +2,7 @@ // 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/mock_input_method_manager_impl.h" +#include "chrome/browser/ash/input_method/mock_input_method_manager_impl.h" #include #include diff --git a/chrome/browser/chromeos/input_method/mock_input_method_manager_impl.h b/chrome/browser/ash/input_method/mock_input_method_manager_impl.h similarity index 94% rename from chrome/browser/chromeos/input_method/mock_input_method_manager_impl.h rename to chrome/browser/ash/input_method/mock_input_method_manager_impl.h index 93d9e58735081..8dbb553ab0196 100644 --- a/chrome/browser/chromeos/input_method/mock_input_method_manager_impl.h +++ b/chrome/browser/ash/input_method/mock_input_method_manager_impl.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_CHROMEOS_INPUT_METHOD_MOCK_INPUT_METHOD_MANAGER_IMPL_H_ -#define CHROME_BROWSER_CHROMEOS_INPUT_METHOD_MOCK_INPUT_METHOD_MANAGER_IMPL_H_ +#ifndef CHROME_BROWSER_ASH_INPUT_METHOD_MOCK_INPUT_METHOD_MANAGER_IMPL_H_ +#define CHROME_BROWSER_ASH_INPUT_METHOD_MOCK_INPUT_METHOD_MANAGER_IMPL_H_ #include @@ -109,4 +109,4 @@ using ::chromeos::input_method::MockInputMethodManagerImpl; } } // namespace ash -#endif // CHROME_BROWSER_CHROMEOS_INPUT_METHOD_MOCK_INPUT_METHOD_MANAGER_IMPL_H_ +#endif // CHROME_BROWSER_ASH_INPUT_METHOD_MOCK_INPUT_METHOD_MANAGER_IMPL_H_ diff --git a/chrome/browser/chromeos/input_method/multi_word_suggester.cc b/chrome/browser/ash/input_method/multi_word_suggester.cc similarity index 99% rename from chrome/browser/chromeos/input_method/multi_word_suggester.cc rename to chrome/browser/ash/input_method/multi_word_suggester.cc index 6580553ed70a2..c1a8de3953937 100644 --- a/chrome/browser/chromeos/input_method/multi_word_suggester.cc +++ b/chrome/browser/ash/input_method/multi_word_suggester.cc @@ -2,7 +2,7 @@ // 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/multi_word_suggester.h" +#include "chrome/browser/ash/input_method/multi_word_suggester.h" #include #include "base/metrics/histogram_functions.h" diff --git a/chrome/browser/chromeos/input_method/multi_word_suggester.h b/chrome/browser/ash/input_method/multi_word_suggester.h similarity index 89% rename from chrome/browser/chromeos/input_method/multi_word_suggester.h rename to chrome/browser/ash/input_method/multi_word_suggester.h index a2c72048ca0cb..5c381f3410a87 100644 --- a/chrome/browser/chromeos/input_method/multi_word_suggester.h +++ b/chrome/browser/ash/input_method/multi_word_suggester.h @@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_CHROMEOS_INPUT_METHOD_MULTI_WORD_SUGGESTER_H_ -#define CHROME_BROWSER_CHROMEOS_INPUT_METHOD_MULTI_WORD_SUGGESTER_H_ +#ifndef CHROME_BROWSER_ASH_INPUT_METHOD_MULTI_WORD_SUGGESTER_H_ +#define CHROME_BROWSER_ASH_INPUT_METHOD_MULTI_WORD_SUGGESTER_H_ #include "base/time/time.h" -#include "chrome/browser/chromeos/input_method/suggester.h" -#include "chrome/browser/chromeos/input_method/suggestion_enums.h" -#include "chrome/browser/chromeos/input_method/suggestion_handler_interface.h" +#include "chrome/browser/ash/input_method/suggester.h" +#include "chrome/browser/ash/input_method/suggestion_enums.h" +#include "chrome/browser/ash/input_method/suggestion_handler_interface.h" #include "chromeos/services/ime/public/cpp/suggestions.h" #include "third_party/abseil-cpp/absl/types/optional.h" @@ -113,4 +113,4 @@ class MultiWordSuggester : public Suggester { } // namespace chromeos -#endif // CHROME_BROWSER_CHROMEOS_INPUT_METHOD_MULTI_WORD_SUGGESTER_H_ +#endif // CHROME_BROWSER_ASH_INPUT_METHOD_MULTI_WORD_SUGGESTER_H_ diff --git a/chrome/browser/chromeos/input_method/multi_word_suggester_unittest.cc b/chrome/browser/ash/input_method/multi_word_suggester_unittest.cc similarity index 99% rename from chrome/browser/chromeos/input_method/multi_word_suggester_unittest.cc rename to chrome/browser/ash/input_method/multi_word_suggester_unittest.cc index d908ba6d8b148..54756960b1c53 100644 --- a/chrome/browser/chromeos/input_method/multi_word_suggester_unittest.cc +++ b/chrome/browser/ash/input_method/multi_word_suggester_unittest.cc @@ -2,7 +2,7 @@ // 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/multi_word_suggester.h" +#include "chrome/browser/ash/input_method/multi_word_suggester.h" #include diff --git a/chrome/browser/chromeos/input_method/native_input_method_engine.cc b/chrome/browser/ash/input_method/native_input_method_engine.cc similarity index 99% rename from chrome/browser/chromeos/input_method/native_input_method_engine.cc rename to chrome/browser/ash/input_method/native_input_method_engine.cc index 97e54ce931465..3426ce5dd6724 100644 --- a/chrome/browser/chromeos/input_method/native_input_method_engine.cc +++ b/chrome/browser/ash/input_method/native_input_method_engine.cc @@ -2,7 +2,7 @@ // 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/native_input_method_engine.h" +#include "chrome/browser/ash/input_method/native_input_method_engine.h" #include "ash/constants/ash_features.h" #include "base/feature_list.h" @@ -17,7 +17,7 @@ #include "base/strings/utf_string_conversions.h" #include "chrome/browser/ash/input_method/autocorrect_manager.h" #include "chrome/browser/ash/input_method/grammar_service_client.h" -#include "chrome/browser/chromeos/input_method/suggestions_service_client.h" +#include "chrome/browser/ash/input_method/suggestions_service_client.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/ui/settings_window_manager_chromeos.h" #include "chrome/browser/ui/webui/settings/chromeos/constants/routes.mojom.h" diff --git a/chrome/browser/chromeos/input_method/native_input_method_engine.h b/chrome/browser/ash/input_method/native_input_method_engine.h similarity index 96% rename from chrome/browser/chromeos/input_method/native_input_method_engine.h rename to chrome/browser/ash/input_method/native_input_method_engine.h index 0ca708ec6d460..351888079f4da 100644 --- a/chrome/browser/chromeos/input_method/native_input_method_engine.h +++ b/chrome/browser/ash/input_method/native_input_method_engine.h @@ -2,15 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_CHROMEOS_INPUT_METHOD_NATIVE_INPUT_METHOD_ENGINE_H_ -#define CHROME_BROWSER_CHROMEOS_INPUT_METHOD_NATIVE_INPUT_METHOD_ENGINE_H_ +#ifndef CHROME_BROWSER_ASH_INPUT_METHOD_NATIVE_INPUT_METHOD_ENGINE_H_ +#define CHROME_BROWSER_ASH_INPUT_METHOD_NATIVE_INPUT_METHOD_ENGINE_H_ #include "base/scoped_observation.h" #include "chrome/browser/ash/input_method/assistive_suggester.h" #include "chrome/browser/ash/input_method/autocorrect_manager.h" #include "chrome/browser/ash/input_method/grammar_manager.h" #include "chrome/browser/ash/input_method/input_method_engine.h" -#include "chrome/browser/chromeos/input_method/suggestions_collector.h" +#include "chrome/browser/ash/input_method/suggestions_collector.h" #include "chrome/browser/ui/ash/keyboard/chrome_keyboard_controller_client.h" #include "chromeos/services/ime/public/cpp/suggestions.h" #include "chromeos/services/ime/public/mojom/input_engine.mojom.h" @@ -190,4 +190,4 @@ class NativeInputMethodEngine } // namespace chromeos -#endif // CHROME_BROWSER_CHROMEOS_INPUT_METHOD_NATIVE_INPUT_METHOD_ENGINE_H_ +#endif // CHROME_BROWSER_ASH_INPUT_METHOD_NATIVE_INPUT_METHOD_ENGINE_H_ diff --git a/chrome/browser/chromeos/input_method/native_input_method_engine_browsertest.cc b/chrome/browser/ash/input_method/native_input_method_engine_browsertest.cc similarity index 99% rename from chrome/browser/chromeos/input_method/native_input_method_engine_browsertest.cc rename to chrome/browser/ash/input_method/native_input_method_engine_browsertest.cc index bfc51f319cefa..5fe54e4f5d2db 100644 --- a/chrome/browser/chromeos/input_method/native_input_method_engine_browsertest.cc +++ b/chrome/browser/ash/input_method/native_input_method_engine_browsertest.cc @@ -2,7 +2,7 @@ // 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/native_input_method_engine.h" +#include "chrome/browser/ash/input_method/native_input_method_engine.h" #include "ash/constants/ash_features.h" #include "ash/constants/ash_pref_names.h" @@ -16,9 +16,9 @@ #include "base/values.h" #include "build/branding_buildflags.h" #include "chrome/browser/ash/input_method/assistive_window_controller.h" +#include "chrome/browser/ash/input_method/suggestion_enums.h" +#include "chrome/browser/ash/input_method/textinput_test_helper.h" #include "chrome/browser/autofill/personal_data_manager_factory.h" -#include "chrome/browser/chromeos/input_method/suggestion_enums.h" -#include "chrome/browser/chromeos/input_method/textinput_test_helper.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/signin/identity_manager_factory.h" #include "chrome/browser/ui/browser_finder.h" diff --git a/chrome/browser/chromeos/input_method/native_input_method_engine_unittest.cc b/chrome/browser/ash/input_method/native_input_method_engine_unittest.cc similarity index 99% rename from chrome/browser/chromeos/input_method/native_input_method_engine_unittest.cc rename to chrome/browser/ash/input_method/native_input_method_engine_unittest.cc index 0f05c31667839..637937c4fbe67 100644 --- a/chrome/browser/chromeos/input_method/native_input_method_engine_unittest.cc +++ b/chrome/browser/ash/input_method/native_input_method_engine_unittest.cc @@ -2,12 +2,12 @@ // 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/native_input_method_engine.h" +#include "chrome/browser/ash/input_method/native_input_method_engine.h" #include "ash/constants/ash_features.h" #include "base/callback_helpers.h" #include "base/feature_list.h" -#include "chrome/browser/chromeos/input_method/stub_input_method_engine_observer.h" +#include "chrome/browser/ash/input_method/stub_input_method_engine_observer.h" #include "chrome/browser/ui/ash/keyboard/chrome_keyboard_controller_client_test_helper.h" #include "chrome/common/pref_names.h" #include "chrome/test/base/testing_profile.h" diff --git a/chrome/browser/chromeos/input_method/personal_info_suggester.cc b/chrome/browser/ash/input_method/personal_info_suggester.cc similarity index 99% rename from chrome/browser/chromeos/input_method/personal_info_suggester.cc rename to chrome/browser/ash/input_method/personal_info_suggester.cc index 63a41a9ccd965..9c74f0e1b288c 100644 --- a/chrome/browser/chromeos/input_method/personal_info_suggester.cc +++ b/chrome/browser/ash/input_method/personal_info_suggester.cc @@ -2,7 +2,7 @@ // 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/personal_info_suggester.h" +#include "chrome/browser/ash/input_method/personal_info_suggester.h" #include "ash/constants/ash_features.h" #include "ash/constants/ash_pref_names.h" diff --git a/chrome/browser/chromeos/input_method/personal_info_suggester.h b/chrome/browser/ash/input_method/personal_info_suggester.h similarity index 88% rename from chrome/browser/chromeos/input_method/personal_info_suggester.h rename to chrome/browser/ash/input_method/personal_info_suggester.h index 4543f2fbe7863..1620b8841a070 100644 --- a/chrome/browser/chromeos/input_method/personal_info_suggester.h +++ b/chrome/browser/ash/input_method/personal_info_suggester.h @@ -2,17 +2,17 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_CHROMEOS_INPUT_METHOD_PERSONAL_INFO_SUGGESTER_H_ -#define CHROME_BROWSER_CHROMEOS_INPUT_METHOD_PERSONAL_INFO_SUGGESTER_H_ +#ifndef CHROME_BROWSER_ASH_INPUT_METHOD_PERSONAL_INFO_SUGGESTER_H_ +#define CHROME_BROWSER_ASH_INPUT_METHOD_PERSONAL_INFO_SUGGESTER_H_ #include #include "base/time/time.h" #include "chrome/browser/ash/input_method/input_method_engine_base.h" -#include "chrome/browser/chromeos/input_method/suggester.h" -#include "chrome/browser/chromeos/input_method/suggestion_enums.h" -#include "chrome/browser/chromeos/input_method/suggestion_handler_interface.h" -#include "chrome/browser/chromeos/input_method/tts_handler.h" +#include "chrome/browser/ash/input_method/suggester.h" +#include "chrome/browser/ash/input_method/suggestion_enums.h" +#include "chrome/browser/ash/input_method/suggestion_handler_interface.h" +#include "chrome/browser/ash/input_method/tts_handler.h" #include "chrome/browser/extensions/api/input_ime/input_ime_api.h" #include "chromeos/services/ime/public/cpp/suggestions.h" @@ -117,4 +117,4 @@ class PersonalInfoSuggester : public Suggester { } // namespace chromeos -#endif // CHROME_BROWSER_CHROMEOS_INPUT_METHOD_PERSONAL_INFO_SUGGESTER_H_ +#endif // CHROME_BROWSER_ASH_INPUT_METHOD_PERSONAL_INFO_SUGGESTER_H_ diff --git a/chrome/browser/chromeos/input_method/personal_info_suggester_unittest.cc b/chrome/browser/ash/input_method/personal_info_suggester_unittest.cc similarity index 99% rename from chrome/browser/chromeos/input_method/personal_info_suggester_unittest.cc rename to chrome/browser/ash/input_method/personal_info_suggester_unittest.cc index ae2c8688c144b..033bd20890573 100644 --- a/chrome/browser/chromeos/input_method/personal_info_suggester_unittest.cc +++ b/chrome/browser/ash/input_method/personal_info_suggester_unittest.cc @@ -2,7 +2,7 @@ // 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/personal_info_suggester.h" +#include "chrome/browser/ash/input_method/personal_info_suggester.h" #include "ash/constants/ash_features.h" #include "ash/constants/ash_pref_names.h" diff --git a/chrome/browser/chromeos/input_method/stub_input_method_engine_observer.h b/chrome/browser/ash/input_method/stub_input_method_engine_observer.h similarity index 88% rename from chrome/browser/chromeos/input_method/stub_input_method_engine_observer.h rename to chrome/browser/ash/input_method/stub_input_method_engine_observer.h index 0a380bd507f2c..1b693129c5a05 100644 --- a/chrome/browser/chromeos/input_method/stub_input_method_engine_observer.h +++ b/chrome/browser/ash/input_method/stub_input_method_engine_observer.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_CHROMEOS_INPUT_METHOD_STUB_INPUT_METHOD_ENGINE_OBSERVER_H_ -#define CHROME_BROWSER_CHROMEOS_INPUT_METHOD_STUB_INPUT_METHOD_ENGINE_OBSERVER_H_ +#ifndef CHROME_BROWSER_ASH_INPUT_METHOD_STUB_INPUT_METHOD_ENGINE_OBSERVER_H_ +#define CHROME_BROWSER_ASH_INPUT_METHOD_STUB_INPUT_METHOD_ENGINE_OBSERVER_H_ #include @@ -51,4 +51,4 @@ class StubInputMethodEngineObserver : public InputMethodEngineBase::Observer { } // namespace input_method } // namespace chromeos -#endif // CHROME_BROWSER_CHROMEOS_INPUT_METHOD_STUB_INPUT_METHOD_ENGINE_OBSERVER_H_ +#endif // CHROME_BROWSER_ASH_INPUT_METHOD_STUB_INPUT_METHOD_ENGINE_OBSERVER_H_ diff --git a/chrome/browser/chromeos/input_method/suggester.h b/chrome/browser/ash/input_method/suggester.h similarity index 85% rename from chrome/browser/chromeos/input_method/suggester.h rename to chrome/browser/ash/input_method/suggester.h index 7570f39cff6a9..49e8a2cf2735b 100644 --- a/chrome/browser/chromeos/input_method/suggester.h +++ b/chrome/browser/ash/input_method/suggester.h @@ -2,15 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_CHROMEOS_INPUT_METHOD_SUGGESTER_H_ -#define CHROME_BROWSER_CHROMEOS_INPUT_METHOD_SUGGESTER_H_ +#ifndef CHROME_BROWSER_ASH_INPUT_METHOD_SUGGESTER_H_ +#define CHROME_BROWSER_ASH_INPUT_METHOD_SUGGESTER_H_ #include #include "chrome/browser/ash/input_method/input_method_engine.h" #include "chrome/browser/ash/input_method/input_method_engine_base.h" -#include "chrome/browser/chromeos/input_method/suggestion_enums.h" -#include "chrome/browser/chromeos/input_method/suggestions_source.h" +#include "chrome/browser/ash/input_method/suggestion_enums.h" +#include "chrome/browser/ash/input_method/suggestions_source.h" namespace chromeos { @@ -53,4 +53,4 @@ class Suggester : public SuggestionsSource { } // namespace chromeos -#endif // CHROME_BROWSER_CHROMEOS_INPUT_METHOD_SUGGESTER_H_ +#endif // CHROME_BROWSER_ASH_INPUT_METHOD_SUGGESTER_H_ diff --git a/chrome/browser/chromeos/input_method/suggestion_enums.h b/chrome/browser/ash/input_method/suggestion_enums.h similarity index 85% rename from chrome/browser/chromeos/input_method/suggestion_enums.h rename to chrome/browser/ash/input_method/suggestion_enums.h index 5c63207b97575..fcf240d7f841d 100644 --- a/chrome/browser/chromeos/input_method/suggestion_enums.h +++ b/chrome/browser/ash/input_method/suggestion_enums.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_CHROMEOS_INPUT_METHOD_SUGGESTION_ENUMS_H_ -#define CHROME_BROWSER_CHROMEOS_INPUT_METHOD_SUGGESTION_ENUMS_H_ +#ifndef CHROME_BROWSER_ASH_INPUT_METHOD_SUGGESTION_ENUMS_H_ +#define CHROME_BROWSER_ASH_INPUT_METHOD_SUGGESTION_ENUMS_H_ namespace chromeos { @@ -47,4 +47,4 @@ enum class DisabledReason { } // namespace chromeos -#endif // CHROME_BROWSER_CHROMEOS_INPUT_METHOD_SUGGESTION_ENUMS_H_ +#endif // CHROME_BROWSER_ASH_INPUT_METHOD_SUGGESTION_ENUMS_H_ diff --git a/chrome/browser/chromeos/input_method/suggestion_handler_interface.h b/chrome/browser/ash/input_method/suggestion_handler_interface.h similarity index 90% rename from chrome/browser/chromeos/input_method/suggestion_handler_interface.h rename to chrome/browser/ash/input_method/suggestion_handler_interface.h index 71de6ab37f9f7..15db2564e267d 100644 --- a/chrome/browser/chromeos/input_method/suggestion_handler_interface.h +++ b/chrome/browser/ash/input_method/suggestion_handler_interface.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_CHROMEOS_INPUT_METHOD_SUGGESTION_HANDLER_INTERFACE_H_ -#define CHROME_BROWSER_CHROMEOS_INPUT_METHOD_SUGGESTION_HANDLER_INTERFACE_H_ +#ifndef CHROME_BROWSER_ASH_INPUT_METHOD_SUGGESTION_HANDLER_INTERFACE_H_ +#define CHROME_BROWSER_ASH_INPUT_METHOD_SUGGESTION_HANDLER_INTERFACE_H_ #include @@ -68,4 +68,4 @@ class SuggestionHandlerInterface { } // namespace chromeos -#endif // CHROME_BROWSER_CHROMEOS_INPUT_METHOD_SUGGESTION_HANDLER_INTERFACE_H_ +#endif // CHROME_BROWSER_ASH_INPUT_METHOD_SUGGESTION_HANDLER_INTERFACE_H_ diff --git a/chrome/browser/chromeos/input_method/suggestions_collector.cc b/chrome/browser/ash/input_method/suggestions_collector.cc similarity index 97% rename from chrome/browser/chromeos/input_method/suggestions_collector.cc rename to chrome/browser/ash/input_method/suggestions_collector.cc index ec1c3a0057a09..4d1e4ad95b737 100644 --- a/chrome/browser/chromeos/input_method/suggestions_collector.cc +++ b/chrome/browser/ash/input_method/suggestions_collector.cc @@ -2,7 +2,7 @@ // 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/suggestions_collector.h" +#include "chrome/browser/ash/input_method/suggestions_collector.h" #include "base/callback.h" #include "chromeos/services/ime/public/cpp/suggestions.h" diff --git a/chrome/browser/chromeos/input_method/suggestions_collector.h b/chrome/browser/ash/input_method/suggestions_collector.h similarity index 84% rename from chrome/browser/chromeos/input_method/suggestions_collector.h rename to chrome/browser/ash/input_method/suggestions_collector.h index d7311c226a269..1541ea9185377 100644 --- a/chrome/browser/chromeos/input_method/suggestions_collector.h +++ b/chrome/browser/ash/input_method/suggestions_collector.h @@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_CHROMEOS_INPUT_METHOD_SUGGESTIONS_COLLECTOR_H_ -#define CHROME_BROWSER_CHROMEOS_INPUT_METHOD_SUGGESTIONS_COLLECTOR_H_ +#ifndef CHROME_BROWSER_ASH_INPUT_METHOD_SUGGESTIONS_COLLECTOR_H_ +#define CHROME_BROWSER_ASH_INPUT_METHOD_SUGGESTIONS_COLLECTOR_H_ #include #include #include "base/callback.h" -#include "chrome/browser/chromeos/input_method/suggestions_source.h" +#include "chrome/browser/ash/input_method/suggestions_source.h" #include "chromeos/services/ime/public/cpp/suggestions.h" #include "chromeos/services/ime/public/mojom/input_method_host.mojom.h" @@ -49,4 +49,4 @@ class SuggestionsCollector { } // namespace chromeos -#endif // CHROME_BROWSER_CHROMEOS_INPUT_METHOD_SUGGESTIONS_COLLECTOR_H_ +#endif // CHROME_BROWSER_ASH_INPUT_METHOD_SUGGESTIONS_COLLECTOR_H_ diff --git a/chrome/browser/chromeos/input_method/suggestions_collector_unittest.cc b/chrome/browser/ash/input_method/suggestions_collector_unittest.cc similarity index 97% rename from chrome/browser/chromeos/input_method/suggestions_collector_unittest.cc rename to chrome/browser/ash/input_method/suggestions_collector_unittest.cc index b0ed77abdb506..8f26d6e804162 100644 --- a/chrome/browser/chromeos/input_method/suggestions_collector_unittest.cc +++ b/chrome/browser/ash/input_method/suggestions_collector_unittest.cc @@ -2,14 +2,14 @@ // 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/suggestions_collector.h" +#include "chrome/browser/ash/input_method/suggestions_collector.h" #include #include "base/bind.h" #include "base/callback.h" #include "base/test/bind.h" -#include "chrome/browser/chromeos/input_method/suggestions_source.h" +#include "chrome/browser/ash/input_method/suggestions_source.h" #include "chromeos/services/ime/public/cpp/suggestions.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/chromeos/input_method/suggestions_service_client.cc b/chrome/browser/ash/input_method/suggestions_service_client.cc similarity index 98% rename from chrome/browser/chromeos/input_method/suggestions_service_client.cc rename to chrome/browser/ash/input_method/suggestions_service_client.cc index 0e918905e5ca6..4151a2ac3ac2a 100644 --- a/chrome/browser/chromeos/input_method/suggestions_service_client.cc +++ b/chrome/browser/ash/input_method/suggestions_service_client.cc @@ -2,7 +2,7 @@ // 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/suggestions_service_client.h" +#include "chrome/browser/ash/input_method/suggestions_service_client.h" #include "base/bind.h" #include "base/metrics/histogram_functions.h" diff --git a/chrome/browser/chromeos/input_method/suggestions_service_client.h b/chrome/browser/ash/input_method/suggestions_service_client.h similarity index 83% rename from chrome/browser/chromeos/input_method/suggestions_service_client.h rename to chrome/browser/ash/input_method/suggestions_service_client.h index a706de9a63033..5d3b3fdaab1dd 100644 --- a/chrome/browser/chromeos/input_method/suggestions_service_client.h +++ b/chrome/browser/ash/input_method/suggestions_service_client.h @@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_CHROMEOS_INPUT_METHOD_SUGGESTIONS_SERVICE_CLIENT_H_ -#define CHROME_BROWSER_CHROMEOS_INPUT_METHOD_SUGGESTIONS_SERVICE_CLIENT_H_ +#ifndef CHROME_BROWSER_ASH_INPUT_METHOD_SUGGESTIONS_SERVICE_CLIENT_H_ +#define CHROME_BROWSER_ASH_INPUT_METHOD_SUGGESTIONS_SERVICE_CLIENT_H_ #include #include "base/callback.h" #include "base/time/time.h" -#include "chrome/browser/chromeos/input_method/suggestions_source.h" +#include "chrome/browser/ash/input_method/suggestions_source.h" #include "chromeos/services/ime/public/cpp/suggestions.h" #include "chromeos/services/machine_learning/public/mojom/text_suggester.mojom.h" #include "mojo/public/cpp/bindings/remote.h" @@ -45,4 +45,4 @@ class SuggestionsServiceClient : public AsyncSuggestionsSource { } // namespace chromeos -#endif // CHROME_BROWSER_CHROMEOS_INPUT_METHOD_SUGGESTIONS_SERVICE_CLIENT_H_ +#endif // CHROME_BROWSER_ASH_INPUT_METHOD_SUGGESTIONS_SERVICE_CLIENT_H_ diff --git a/chrome/browser/chromeos/input_method/suggestions_service_client_unittest.cc b/chrome/browser/ash/input_method/suggestions_service_client_unittest.cc similarity index 98% rename from chrome/browser/chromeos/input_method/suggestions_service_client_unittest.cc rename to chrome/browser/ash/input_method/suggestions_service_client_unittest.cc index 8f9a959f55bf0..cb78924a493c6 100644 --- a/chrome/browser/chromeos/input_method/suggestions_service_client_unittest.cc +++ b/chrome/browser/ash/input_method/suggestions_service_client_unittest.cc @@ -2,7 +2,7 @@ // 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/suggestions_service_client.h" +#include "chrome/browser/ash/input_method/suggestions_service_client.h" #include "base/run_loop.h" #include "base/test/bind.h" diff --git a/chrome/browser/chromeos/input_method/suggestions_source.h b/chrome/browser/ash/input_method/suggestions_source.h similarity index 87% rename from chrome/browser/chromeos/input_method/suggestions_source.h rename to chrome/browser/ash/input_method/suggestions_source.h index 66a1267cbb889..f1983e6c61be0 100644 --- a/chrome/browser/chromeos/input_method/suggestions_source.h +++ b/chrome/browser/ash/input_method/suggestions_source.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_CHROMEOS_INPUT_METHOD_SUGGESTIONS_SOURCE_H_ -#define CHROME_BROWSER_CHROMEOS_INPUT_METHOD_SUGGESTIONS_SOURCE_H_ +#ifndef CHROME_BROWSER_ASH_INPUT_METHOD_SUGGESTIONS_SOURCE_H_ +#define CHROME_BROWSER_ASH_INPUT_METHOD_SUGGESTIONS_SOURCE_H_ #include @@ -46,4 +46,4 @@ class AsyncSuggestionsSource { } // namespace chromeos -#endif // CHROME_BROWSER_CHROMEOS_INPUT_METHOD_SUGGESTIONS_SOURCE_H_ +#endif // CHROME_BROWSER_ASH_INPUT_METHOD_SUGGESTIONS_SOURCE_H_ diff --git a/chrome/browser/chromeos/input_method/text_utils.cc b/chrome/browser/ash/input_method/text_utils.cc similarity index 98% rename from chrome/browser/chromeos/input_method/text_utils.cc rename to chrome/browser/ash/input_method/text_utils.cc index 7ae1a2f587afd..22eed1c34a65e 100644 --- a/chrome/browser/chromeos/input_method/text_utils.cc +++ b/chrome/browser/ash/input_method/text_utils.cc @@ -2,7 +2,7 @@ // 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/text_utils.h" +#include "chrome/browser/ash/input_method/text_utils.h" // TODO(crbug/1223597) The rules to detect sentence end is not perfect, and we // may want to use regex to improve readability. diff --git a/chrome/browser/chromeos/input_method/text_utils.h b/chrome/browser/ash/input_method/text_utils.h similarity index 88% rename from chrome/browser/chromeos/input_method/text_utils.h rename to chrome/browser/ash/input_method/text_utils.h index 59cfcf85fb56d..8fc4687e10937 100644 --- a/chrome/browser/chromeos/input_method/text_utils.h +++ b/chrome/browser/ash/input_method/text_utils.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_CHROMEOS_INPUT_METHOD_TEXT_UTILS_H_ -#define CHROME_BROWSER_CHROMEOS_INPUT_METHOD_TEXT_UTILS_H_ +#ifndef CHROME_BROWSER_ASH_INPUT_METHOD_TEXT_UTILS_H_ +#define CHROME_BROWSER_ASH_INPUT_METHOD_TEXT_UTILS_H_ #include @@ -46,4 +46,4 @@ Sentence FindCurrentSentence(const std::u16string& text, int pos); } // namespace text_utils } // namespace chromeos -#endif // CHROME_BROWSER_CHROMEOS_INPUT_METHOD_TEXT_UTILS_H_ +#endif // CHROME_BROWSER_ASH_INPUT_METHOD_TEXT_UTILS_H_ diff --git a/chrome/browser/chromeos/input_method/text_utils_unittest.cc b/chrome/browser/ash/input_method/text_utils_unittest.cc similarity index 98% rename from chrome/browser/chromeos/input_method/text_utils_unittest.cc rename to chrome/browser/ash/input_method/text_utils_unittest.cc index ed2149a8f2f12..eaee34575a60e 100644 --- a/chrome/browser/chromeos/input_method/text_utils_unittest.cc +++ b/chrome/browser/ash/input_method/text_utils_unittest.cc @@ -2,7 +2,7 @@ // 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/text_utils.h" +#include "chrome/browser/ash/input_method/text_utils.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/chromeos/input_method/textinput_browsertest.cc b/chrome/browser/ash/input_method/textinput_browsertest.cc similarity index 99% rename from chrome/browser/chromeos/input_method/textinput_browsertest.cc rename to chrome/browser/ash/input_method/textinput_browsertest.cc index 4fd6e6884ea4e..3a68d4cd02916 100644 --- a/chrome/browser/chromeos/input_method/textinput_browsertest.cc +++ b/chrome/browser/ash/input_method/textinput_browsertest.cc @@ -4,7 +4,7 @@ #include -#include "chrome/browser/chromeos/input_method/textinput_test_helper.h" +#include "chrome/browser/ash/input_method/textinput_test_helper.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" diff --git a/chrome/browser/chromeos/input_method/textinput_surroundingtext_browsertest.cc b/chrome/browser/ash/input_method/textinput_surroundingtext_browsertest.cc similarity index 98% rename from chrome/browser/chromeos/input_method/textinput_surroundingtext_browsertest.cc rename to chrome/browser/ash/input_method/textinput_surroundingtext_browsertest.cc index 5fd2a49162be8..ba599e6dedc08 100644 --- a/chrome/browser/chromeos/input_method/textinput_surroundingtext_browsertest.cc +++ b/chrome/browser/ash/input_method/textinput_surroundingtext_browsertest.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "base/strings/utf_string_conversions.h" -#include "chrome/browser/chromeos/input_method/textinput_test_helper.h" +#include "chrome/browser/ash/input_method/textinput_test_helper.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/test/base/interactive_test_utils.h" diff --git a/chrome/browser/chromeos/input_method/textinput_test_helper.cc b/chrome/browser/ash/input_method/textinput_test_helper.cc similarity index 99% rename from chrome/browser/chromeos/input_method/textinput_test_helper.cc rename to chrome/browser/ash/input_method/textinput_test_helper.cc index e93499c39a90c..027f9eaa10ef1 100644 --- a/chrome/browser/chromeos/input_method/textinput_test_helper.cc +++ b/chrome/browser/ash/input_method/textinput_test_helper.cc @@ -2,7 +2,7 @@ // 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/textinput_test_helper.h" +#include "chrome/browser/ash/input_method/textinput_test_helper.h" #include "base/run_loop.h" #include "base/strings/string_number_conversions.h" diff --git a/chrome/browser/chromeos/input_method/textinput_test_helper.h b/chrome/browser/ash/input_method/textinput_test_helper.h similarity index 94% rename from chrome/browser/chromeos/input_method/textinput_test_helper.h rename to chrome/browser/ash/input_method/textinput_test_helper.h index faba3673ac6cc..8f3d87d2d5e32 100644 --- a/chrome/browser/chromeos/input_method/textinput_test_helper.h +++ b/chrome/browser/ash/input_method/textinput_test_helper.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_CHROMEOS_INPUT_METHOD_TEXTINPUT_TEST_HELPER_H_ -#define CHROME_BROWSER_CHROMEOS_INPUT_METHOD_TEXTINPUT_TEST_HELPER_H_ +#ifndef CHROME_BROWSER_ASH_INPUT_METHOD_TEXTINPUT_TEST_HELPER_H_ +#define CHROME_BROWSER_ASH_INPUT_METHOD_TEXTINPUT_TEST_HELPER_H_ #include "base/macros.h" #include "chrome/test/base/in_process_browser_test.h" @@ -103,4 +103,4 @@ class TextInputTestHelper : public ui::InputMethodObserver { } // namespace chromeos -#endif // CHROME_BROWSER_CHROMEOS_INPUT_METHOD_TEXTINPUT_TEST_HELPER_H_ +#endif // CHROME_BROWSER_ASH_INPUT_METHOD_TEXTINPUT_TEST_HELPER_H_ diff --git a/chrome/browser/chromeos/input_method/tts_handler.cc b/chrome/browser/ash/input_method/tts_handler.cc similarity index 96% rename from chrome/browser/chromeos/input_method/tts_handler.cc rename to chrome/browser/ash/input_method/tts_handler.cc index 1081dbd92100d..6a62b1576c125 100644 --- a/chrome/browser/chromeos/input_method/tts_handler.cc +++ b/chrome/browser/ash/input_method/tts_handler.cc @@ -2,7 +2,7 @@ // 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/tts_handler.h" +#include "chrome/browser/ash/input_method/tts_handler.h" #include "ash/constants/ash_pref_names.h" #include "chrome/browser/profiles/profile_manager.h" diff --git a/chrome/browser/chromeos/input_method/tts_handler.h b/chrome/browser/ash/input_method/tts_handler.h similarity index 86% rename from chrome/browser/chromeos/input_method/tts_handler.h rename to chrome/browser/ash/input_method/tts_handler.h index 705a9bcdada7e..8de874ccf95fe 100644 --- a/chrome/browser/chromeos/input_method/tts_handler.h +++ b/chrome/browser/ash/input_method/tts_handler.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_CHROMEOS_INPUT_METHOD_TTS_HANDLER_H_ -#define CHROME_BROWSER_CHROMEOS_INPUT_METHOD_TTS_HANDLER_H_ +#ifndef CHROME_BROWSER_ASH_INPUT_METHOD_TTS_HANDLER_H_ +#define CHROME_BROWSER_ASH_INPUT_METHOD_TTS_HANDLER_H_ #include @@ -40,4 +40,4 @@ class TtsHandler : public content::UtteranceEventDelegate { }; } // namespace chromeos -#endif // CHROME_BROWSER_CHROMEOS_INPUT_METHOD_TTS_HANDLER_H_ +#endif // CHROME_BROWSER_ASH_INPUT_METHOD_TTS_HANDLER_H_ diff --git a/chrome/browser/ash/login/lock/screen_locker_unittest.cc b/chrome/browser/ash/login/lock/screen_locker_unittest.cc index e393eeaae0bc9..5e83d8a8cdb55 100644 --- a/chrome/browser/ash/login/lock/screen_locker_unittest.cc +++ b/chrome/browser/ash/login/lock/screen_locker_unittest.cc @@ -16,12 +16,12 @@ #include "chrome/browser/ash/accessibility/accessibility_manager.h" #include "chrome/browser/ash/certificate_provider/certificate_provider_service.h" #include "chrome/browser/ash/certificate_provider/certificate_provider_service_factory.h" +#include "chrome/browser/ash/input_method/mock_input_method_manager_impl.h" #include "chrome/browser/ash/lock_screen_apps/state_controller.h" #include "chrome/browser/ash/login/users/fake_chrome_user_manager.h" #include "chrome/browser/ash/profiles/profile_helper.h" #include "chrome/browser/ash/settings/device_settings_test_helper.h" #include "chrome/browser/ash/settings/scoped_testing_cros_settings.h" -#include "chrome/browser/chromeos/input_method/mock_input_method_manager_impl.h" #include "chrome/browser/ui/ash/accessibility/fake_accessibility_controller.h" #include "chrome/browser/ui/ash/assistant/assistant_browser_delegate_impl.h" #include "chrome/browser/ui/ash/login_screen_client_impl.h" diff --git a/chrome/browser/chromeos/BUILD.gn b/chrome/browser/chromeos/BUILD.gn index f3c35789cfdfb..fdd854dfa9b0e 100644 --- a/chrome/browser/chromeos/BUILD.gn +++ b/chrome/browser/chromeos/BUILD.gn @@ -1503,6 +1503,24 @@ source_set("chromeos") { "../ash/input_method/input_method_persistence.h", "../ash/input_method/input_method_syncer.cc", "../ash/input_method/input_method_syncer.h", + "../ash/input_method/multi_word_suggester.cc", + "../ash/input_method/multi_word_suggester.h", + "../ash/input_method/native_input_method_engine.cc", + "../ash/input_method/native_input_method_engine.h", + "../ash/input_method/personal_info_suggester.cc", + "../ash/input_method/personal_info_suggester.h", + "../ash/input_method/suggester.h", + "../ash/input_method/suggestion_enums.h", + "../ash/input_method/suggestion_handler_interface.h", + "../ash/input_method/suggestions_collector.cc", + "../ash/input_method/suggestions_collector.h", + "../ash/input_method/suggestions_service_client.cc", + "../ash/input_method/suggestions_service_client.h", + "../ash/input_method/suggestions_source.h", + "../ash/input_method/text_utils.cc", + "../ash/input_method/text_utils.h", + "../ash/input_method/tts_handler.cc", + "../ash/input_method/tts_handler.h", "../ash/kerberos/kerberos_credentials_manager.cc", "../ash/kerberos/kerberos_credentials_manager.h", "../ash/kerberos/kerberos_credentials_manager_factory.cc", @@ -2846,24 +2864,6 @@ source_set("chromeos") { "fileapi/recent_source.h", "idle_detector.cc", "idle_detector.h", - "input_method/multi_word_suggester.cc", - "input_method/multi_word_suggester.h", - "input_method/native_input_method_engine.cc", - "input_method/native_input_method_engine.h", - "input_method/personal_info_suggester.cc", - "input_method/personal_info_suggester.h", - "input_method/suggester.h", - "input_method/suggestion_enums.h", - "input_method/suggestion_handler_interface.h", - "input_method/suggestions_collector.cc", - "input_method/suggestions_collector.h", - "input_method/suggestions_service_client.cc", - "input_method/suggestions_service_client.h", - "input_method/suggestions_source.h", - "input_method/text_utils.cc", - "input_method/text_utils.h", - "input_method/tts_handler.cc", - "input_method/tts_handler.h", "input_method/ui/assistive_delegate.h", "input_method/ui/border_factory.cc", "input_method/ui/border_factory.h", @@ -3451,6 +3451,7 @@ static_library("test_support") { "../ash/drive/drivefs_test_support.h", "../ash/file_manager/mount_test_util.cc", "../ash/file_manager/mount_test_util.h", + "../ash/input_method/stub_input_method_engine_observer.h", "../ash/lock_screen_apps/fake_lock_screen_profile_creator.cc", "../ash/lock_screen_apps/fake_lock_screen_profile_creator.h", "../ash/login/demo_mode/demo_mode_test_helper.cc", @@ -3538,7 +3539,6 @@ static_library("test_support") { "fake_device_name_applier.h", "fake_device_name_store.cc", "fake_device_name_store.h", - "input_method/stub_input_method_engine_observer.h", "platform_keys/key_permissions/fake_user_private_token_kpm_service.cc", "platform_keys/key_permissions/fake_user_private_token_kpm_service.h", "platform_keys/key_permissions/mock_key_permissions_manager.cc", @@ -3893,6 +3893,12 @@ source_set("unit_tests") { "../ash/input_method/input_method_engine_unittest.cc", "../ash/input_method/input_method_manager_impl_unittest.cc", "../ash/input_method/input_method_persistence_unittest.cc", + "../ash/input_method/multi_word_suggester_unittest.cc", + "../ash/input_method/native_input_method_engine_unittest.cc", + "../ash/input_method/personal_info_suggester_unittest.cc", + "../ash/input_method/suggestions_collector_unittest.cc", + "../ash/input_method/suggestions_service_client_unittest.cc", + "../ash/input_method/text_utils_unittest.cc", "../ash/kerberos/kerberos_credentials_manager_test.cc", "../ash/kerberos/kerberos_ticket_expiry_notification_test.cc", "../ash/lock_screen_apps/app_manager_impl_unittest.cc", @@ -4222,12 +4228,6 @@ source_set("unit_tests") { "fileapi/recent_disk_source_unittest.cc", "fileapi/recent_model_unittest.cc", "fileapi/test/fake_recent_source.cc", - "input_method/multi_word_suggester_unittest.cc", - "input_method/native_input_method_engine_unittest.cc", - "input_method/personal_info_suggester_unittest.cc", - "input_method/suggestions_collector_unittest.cc", - "input_method/suggestions_service_client_unittest.cc", - "input_method/text_utils_unittest.cc", "input_method/ui/candidate_view_unittest.cc", "input_method/ui/candidate_window_view_unittest.cc", "input_method/ui/grammar_suggestion_window_unittest.cc", diff --git a/chrome/browser/chromeos/events/event_rewriter_unittest.cc b/chrome/browser/chromeos/events/event_rewriter_unittest.cc index 91298b74650a2..af3f9e39026f9 100644 --- a/chrome/browser/chromeos/events/event_rewriter_unittest.cc +++ b/chrome/browser/chromeos/events/event_rewriter_unittest.cc @@ -16,10 +16,10 @@ #include "base/strings/stringprintf.h" #include "base/test/scoped_feature_list.h" #include "chrome/browser/ash/input_method/input_method_configuration.h" +#include "chrome/browser/ash/input_method/mock_input_method_manager_impl.h" #include "chrome/browser/ash/login/users/fake_chrome_user_manager.h" #include "chrome/browser/ash/notifications/deprecation_notification_controller.h" #include "chrome/browser/chromeos/events/event_rewriter_delegate_impl.h" -#include "chrome/browser/chromeos/input_method/mock_input_method_manager_impl.h" #include "chrome/browser/chromeos/preferences.h" #include "chrome/common/pref_names.h" #include "chrome/test/base/chrome_ash_test_base.h" diff --git a/chrome/browser/chromeos/extensions/input_method_api.cc b/chrome/browser/chromeos/extensions/input_method_api.cc index 051829cec3a13..573a7e0aa16ca 100644 --- a/chrome/browser/chromeos/extensions/input_method_api.cc +++ b/chrome/browser/chromeos/extensions/input_method_api.cc @@ -18,10 +18,10 @@ #include "base/values.h" #include "build/build_config.h" #include "chrome/browser/ash/input_method/autocorrect_manager.h" +#include "chrome/browser/ash/input_method/native_input_method_engine.h" #include "chrome/browser/chromeos/extensions/dictionary_event_router.h" #include "chrome/browser/chromeos/extensions/ime_menu_event_router.h" #include "chrome/browser/chromeos/extensions/input_method_event_router.h" -#include "chrome/browser/chromeos/input_method/native_input_method_engine.h" #include "chrome/browser/extensions/api/input_ime/input_ime_api.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/spellchecker/spellcheck_factory.h" diff --git a/chrome/browser/chromeos/preferences_unittest.cc b/chrome/browser/chromeos/preferences_unittest.cc index afc4255ab9184..3c90acae78d58 100644 --- a/chrome/browser/chromeos/preferences_unittest.cc +++ b/chrome/browser/chromeos/preferences_unittest.cc @@ -15,9 +15,9 @@ #include "base/strings/string_util.h" #include "base/test/scoped_feature_list.h" #include "chrome/browser/ash/input_method/input_method_configuration.h" +#include "chrome/browser/ash/input_method/mock_input_method_manager_impl.h" #include "chrome/browser/ash/login/session/user_session_manager.h" #include "chrome/browser/ash/login/users/fake_chrome_user_manager.h" -#include "chrome/browser/chromeos/input_method/mock_input_method_manager_impl.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/pref_names.h" #include "chrome/test/base/testing_browser_process.h" diff --git a/chrome/browser/extensions/api/input_ime/input_ime_api_chromeos.cc b/chrome/browser/extensions/api/input_ime/input_ime_api_chromeos.cc index 4a91e3ee300d4..b57008efdb90b 100644 --- a/chrome/browser/extensions/api/input_ime/input_ime_api_chromeos.cc +++ b/chrome/browser/extensions/api/input_ime/input_ime_api_chromeos.cc @@ -16,10 +16,10 @@ #include "chrome/browser/ash/input_method/assistive_window_properties.h" #include "chrome/browser/ash/input_method/input_host_helper.h" #include "chrome/browser/ash/input_method/input_method_engine.h" +#include "chrome/browser/ash/input_method/native_input_method_engine.h" #include "chrome/browser/ash/login/lock/screen_locker.h" #include "chrome/browser/ash/login/session/user_session_manager.h" #include "chrome/browser/ash/profiles/profile_helper.h" -#include "chrome/browser/chromeos/input_method/native_input_method_engine.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/ui/ash/keyboard/chrome_keyboard_controller_client.h" #include "chrome/common/extensions/api/input_ime.h" diff --git a/chrome/browser/ui/ash/keyboard/keyboard_end_to_end_browsertest.cc b/chrome/browser/ui/ash/keyboard/keyboard_end_to_end_browsertest.cc index f152f3a5c5149..d9e3af66d2467 100644 --- a/chrome/browser/ui/ash/keyboard/keyboard_end_to_end_browsertest.cc +++ b/chrome/browser/ui/ash/keyboard/keyboard_end_to_end_browsertest.cc @@ -7,7 +7,7 @@ #include "base/command_line.h" #include "base/files/file.h" #include "base/run_loop.h" -#include "chrome/browser/chromeos/input_method/textinput_test_helper.h" +#include "chrome/browser/ash/input_method/textinput_test_helper.h" #include "chrome/browser/ui/ash/keyboard/chrome_keyboard_controller_client.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_window.h" diff --git a/chrome/browser/ui/views/frame/test_with_browser_view.cc b/chrome/browser/ui/views/frame/test_with_browser_view.cc index d2a4339e681e2..2efa727f1f520 100644 --- a/chrome/browser/ui/views/frame/test_with_browser_view.cc +++ b/chrome/browser/ui/views/frame/test_with_browser_view.cc @@ -36,7 +36,7 @@ #if BUILDFLAG(IS_CHROMEOS_ASH) #include "chrome/browser/ash/input_method/input_method_configuration.h" -#include "chrome/browser/chromeos/input_method/mock_input_method_manager_impl.h" +#include "chrome/browser/ash/input_method/mock_input_method_manager_impl.h" #endif namespace { diff --git a/chrome/browser/ui/views/omnibox/omnibox_view_views_unittest.cc b/chrome/browser/ui/views/omnibox/omnibox_view_views_unittest.cc index a3bccd644936e..edf6f7c436575 100644 --- a/chrome/browser/ui/views/omnibox/omnibox_view_views_unittest.cc +++ b/chrome/browser/ui/views/omnibox/omnibox_view_views_unittest.cc @@ -60,7 +60,7 @@ #if BUILDFLAG(IS_CHROMEOS_ASH) #include "chrome/browser/ash/input_method/input_method_configuration.h" -#include "chrome/browser/chromeos/input_method/mock_input_method_manager_impl.h" +#include "chrome/browser/ash/input_method/mock_input_method_manager_impl.h" #endif using FeatureAndParams = base::test::ScopedFeatureList::FeatureAndParams; diff --git a/chrome/browser/ui/webui/chromeos/login/l10n_util_test_util.h b/chrome/browser/ui/webui/chromeos/login/l10n_util_test_util.h index 61e1564167858..753576bd975d1 100644 --- a/chrome/browser/ui/webui/chromeos/login/l10n_util_test_util.h +++ b/chrome/browser/ui/webui/chromeos/login/l10n_util_test_util.h @@ -10,7 +10,7 @@ #include "base/compiler_specific.h" #include "base/macros.h" -#include "chrome/browser/chromeos/input_method/mock_input_method_manager_impl.h" +#include "chrome/browser/ash/input_method/mock_input_method_manager_impl.h" #include "ui/base/ime/chromeos/input_method_descriptor.h" namespace chromeos { diff --git a/chrome/browser/ui/webui/settings/chromeos/accessibility_handler_browsertest.cc b/chrome/browser/ui/webui/settings/chromeos/accessibility_handler_browsertest.cc index 4d9bbf969c190..fd90d5ce2ae60 100644 --- a/chrome/browser/ui/webui/settings/chromeos/accessibility_handler_browsertest.cc +++ b/chrome/browser/ui/webui/settings/chromeos/accessibility_handler_browsertest.cc @@ -7,8 +7,8 @@ #include #include +#include "chrome/browser/ash/input_method/mock_input_method_engine.h" #include "chrome/browser/browser_process.h" -#include "chrome/browser/chromeos/input_method/mock_input_method_engine.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/ui/browser.h" #include "chrome/test/base/in_process_browser_test.h" diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn index 85f9ad0661f9e..57c593d1857c4 100644 --- a/chrome/test/BUILD.gn +++ b/chrome/test/BUILD.gn @@ -3119,6 +3119,11 @@ if (!is_android) { "../browser/ash/first_run/drive_first_run_browsertest.cc", "../browser/ash/full_restore/full_restore_app_launch_handler_browsertest.cc", "../browser/ash/input_method/input_method_engine_browsertests.cc", + "../browser/ash/input_method/native_input_method_engine_browsertest.cc", + "../browser/ash/input_method/textinput_browsertest.cc", + "../browser/ash/input_method/textinput_surroundingtext_browsertest.cc", + "../browser/ash/input_method/textinput_test_helper.cc", + "../browser/ash/input_method/textinput_test_helper.h", "../browser/ash/kerberos/kerberos_credentials_manager_factory_browsertest.cc", "../browser/ash/lock_screen_apps/note_taking_browsertest.cc", "../browser/ash/login/accessibility_browsertest.cc", @@ -3376,11 +3381,6 @@ if (!is_android) { "../browser/chromeos/extensions/wallpaper_manager_browsertest.cc", "../browser/chromeos/extensions/wallpaper_private_apitest.cc", "../browser/chromeos/extensions/wm/wm_desks_private_apitest.cc", - "../browser/chromeos/input_method/native_input_method_engine_browsertest.cc", - "../browser/chromeos/input_method/textinput_browsertest.cc", - "../browser/chromeos/input_method/textinput_surroundingtext_browsertest.cc", - "../browser/chromeos/input_method/textinput_test_helper.cc", - "../browser/chromeos/input_method/textinput_test_helper.h", "../browser/chromeos/logging_browsertest.cc", "../browser/chromeos/net/device_event_log_error_browsertest.cc", "../browser/chromeos/net/network_portal_detector_impl_browsertest.cc",