diff --git a/src/engine/BUILD.bazel b/src/engine/BUILD.bazel index f85d649ed..0421b6202 100644 --- a/src/engine/BUILD.bazel +++ b/src/engine/BUILD.bazel @@ -362,9 +362,6 @@ mozc_cc_library( name = "minimal_engine", srcs = ["minimal_engine.cc"], hdrs = ["minimal_engine.h"], - visibility = [ - "//:__subpackages__", - ], deps = [ ":engine_interface", ":modules", diff --git a/src/ios/ios_engine.cc b/src/ios/ios_engine.cc index da2cf9926..821427a1f 100644 --- a/src/ios/ios_engine.cc +++ b/src/ios/ios_engine.cc @@ -43,7 +43,6 @@ #include "data_manager/data_manager.h" #include "engine/engine.h" #include "engine/engine_interface.h" -#include "engine/minimal_engine.h" #include "protocol/commands.pb.h" #include "protocol/user_dictionary_storage.pb.h" #include "session/session_handler.h" @@ -66,13 +65,13 @@ std::unique_ptr CreateMobileEngine( LOG(ERROR) << "Fallback to MinimalEngine due to data manager creation error: " << data_manager.status(); - return std::make_unique(); + return Engine::CreateEngine(); } auto engine = Engine::CreateMobileEngine(*std::move(data_manager)); if (!engine.ok()) { LOG(ERROR) << "Failed to create an engine: " << engine.status() << ". Fallback to MinimalEngine"; - return std::make_unique(); + return Engine::CreateEngine(); } return *std::move(engine); } diff --git a/src/session/BUILD.bazel b/src/session/BUILD.bazel index 4913e5592..4d699bb8a 100644 --- a/src/session/BUILD.bazel +++ b/src/session/BUILD.bazel @@ -365,7 +365,6 @@ mozc_cc_test( "//engine", "//engine:engine_interface", "//engine:engine_mock", - "//engine:minimal_engine", "//engine:mock_data_engine_factory", "//engine:modules", "//engine:supplemental_model_interface", diff --git a/src/session/session_handler_test.cc b/src/session/session_handler_test.cc index d27ab5caf..c3b8b0de3 100644 --- a/src/session/session_handler_test.cc +++ b/src/session/session_handler_test.cc @@ -55,7 +55,6 @@ #include "engine/engine.h" #include "engine/engine_interface.h" #include "engine/engine_mock.h" -#include "engine/minimal_engine.h" #include "engine/mock_data_engine_factory.h" #include "engine/modules.h" #include "protocol/commands.pb.h" diff --git a/src/session/session_test.gyp b/src/session/session_test.gyp index 783104de6..16e6ec249 100644 --- a/src/session/session_test.gyp +++ b/src/session/session_test.gyp @@ -105,7 +105,6 @@ '<(mozc_oss_src_dir)/base/base_test.gyp:clock_mock', '<(mozc_oss_src_dir)/data_manager/oss/oss_data_manager.gyp:oss_data_manager', '<(mozc_oss_src_dir)/data_manager/testing/mock_data_manager.gyp:mock_data_manager', - '<(mozc_oss_src_dir)/engine/engine.gyp:minimal_engine', '<(mozc_oss_src_dir)/testing/testing.gyp:gtest_main', '<(mozc_oss_src_dir)/testing/testing.gyp:mozctest', '<(mozc_oss_src_dir)/usage_stats/usage_stats_test.gyp:usage_stats_testing_util',