Run Clang's Include Cleaner on //ios, //ipc and //mac.

PiperOrigin-RevId: 634708266

src/ios/BUILD.bazel

@@ -41,7 +41,6 @@ mozc_cc_library(
     visibility = [
     ],
     deps = [
-        "//base:port",
         "//base:util",
         "//config:config_handler",
         "//data_manager",
@@ -71,6 +70,8 @@ mozc_cc_binary(
         "//base:init_mozc_buildtool",
         "//base/strings:unicode",
         "//protocol:candidates_cc_proto",
+        "//protocol:commands_cc_proto",
+        "//protocol:config_cc_proto",
         "@com_google_absl//absl/flags:flag",
         "@com_google_absl//absl/log",
         "@com_google_absl//absl/strings",
@@ -82,7 +83,6 @@ mozc_cc_library(
     srcs = ["ios_engine_stub.cc"],
     hdrs = ["ios_engine.h"],
     deps = [
-        "//base:port",
         "//protocol:commands_cc_proto",
         "//protocol:config_cc_proto",
         "@com_google_absl//absl/base:core_headers",

src/ios/ios_engine.h

@@ -36,7 +36,6 @@
 
 #include "absl/base/thread_annotations.h"
 #include "absl/synchronization/mutex.h"
-#include "base/port.h"
 #include "protocol/commands.pb.h"
 #include "protocol/config.pb.h"
 

src/ios/ios_engine_main.cc

@@ -41,6 +41,8 @@
 #include "base/strings/unicode.h"
 #include "ios/ios_engine.h"
 #include "protocol/candidates.pb.h"
+#include "protocol/commands.pb.h"
+#include "protocol/config.pb.h"
 
 // mozc/data_manager/testing:mozc_dataset_for_testing is one of datafile.
 ABSL_FLAG(std::string, datafile, "", "Path to a data file to be used");

src/ipc/BUILD.bazel

@@ -54,12 +54,13 @@ mozc_cc_library(
         "//base:const",
         "//base:cpu_stats",
         "//base:file_util",
-        "//base:logging",
         "//base:singleton",
         "//base:system_util",
         "//base:thread",
         "//base:util",
         "//base:vlog",
+        "@com_google_absl//absl/log",
+        "@com_google_absl//absl/log:check",
         "@com_google_absl//absl/status",
         "@com_google_absl//absl/strings",
         "@com_google_absl//absl/strings:str_format",
@@ -97,7 +98,6 @@ mozc_cc_library(
         "//base:const",
         "//base:file_stream",
         "//base:file_util",
-        "//base:logging",
         "//base:obfuscator_support",
         "//base:port",
         "//base:process_mutex",
@@ -109,6 +109,8 @@ mozc_cc_library(
         "//base:vlog",
         "//testing:friend_test",
         "@com_google_absl//absl/container:flat_hash_map",
+        "@com_google_absl//absl/log",
+        "@com_google_absl//absl/log:check",
         "@com_google_absl//absl/strings",
         "@com_google_absl//absl/strings:str_format",
         "@com_google_absl//absl/synchronization",
@@ -128,8 +130,9 @@ mozc_cc_binary(
     deps = [
         ":ipc_path_manager",
         "//base:init_mozc_buildtool",
-        "//base:logging",
         "@com_google_absl//absl/flags:flag",
+        "@com_google_absl//absl/log",
+        "@com_google_absl//absl/log:check",
         "@com_google_absl//absl/time",
     ],
 )
@@ -172,7 +175,7 @@ mozc_cc_library(
     hdrs = ["ipc_test_util.h"],
     deps = [
         ":ipc",
-        "//base:logging",
+        "@com_google_absl//absl/log:check",
     ],
 )
 
@@ -199,9 +202,10 @@ mozc_cc_binary(
     deps = [
         ":ipc",
         "//base:init_mozc_buildtool",
-        "//base:logging",
         "//base:thread",
         "@com_google_absl//absl/flags:flag",
+        "@com_google_absl//absl/log",
+        "@com_google_absl//absl/log:check",
         "@com_google_absl//absl/strings",
         "@com_google_absl//absl/time",
     ],
@@ -214,9 +218,9 @@ mozc_cc_library(
     deps = [
         "//base:const",
         "//base:hash",
-        "//base:logging",
         "//base:system_util",
         "//base:vlog",
+        "@com_google_absl//absl/log",
         "@com_google_absl//absl/strings",
         "@com_google_absl//absl/strings:str_format",
         "@com_google_absl//absl/time",
@@ -234,8 +238,9 @@ mozc_cc_binary(
     deps = [
         ":named_event",
         "//base:init_mozc_buildtool",
-        "//base:logging",
         "@com_google_absl//absl/flags:flag",
+        "@com_google_absl//absl/log",
+        "@com_google_absl//absl/log:check",
         "@com_google_absl//absl/time",
     ],
 )
@@ -259,16 +264,16 @@ mozc_cc_library(
     srcs = ["process_watch_dog.cc"],
     hdrs = ["process_watch_dog.h"],
     deps = [
-        "//base:logging",
         "//base:port",
         "//base:thread",
-        "//base:vlog",
         "@com_google_absl//absl/base:core_headers",
         "@com_google_absl//absl/functional:any_invocable",
+        "@com_google_absl//absl/log",
         "@com_google_absl//absl/synchronization",
         "@com_google_absl//absl/time",
     ] + mozc_select(
         windows = [
+            "//base:vlog",
             "//base/win32:hresult",
             "@com_microsoft_wil//:wil",
         ],
@@ -304,8 +309,8 @@ mozc_cc_test(
     deps = [
         ":process_watch_dog",
         "//base:clock",
-        "//base:logging",
         "//testing:gunit_main",
+        "@com_google_absl//absl/log",
         "@com_google_absl//absl/time",
     ],
 )

src/ipc/ipc.cc

@@ -33,16 +33,18 @@
 #include <memory>
 #include <string>
 
+#include "absl/log/check.h"
+#include "absl/log/log.h"
 #include "absl/strings/string_view.h"
-#include "base/logging.h"
 #include "base/singleton.h"
 #include "base/thread.h"
-#include "base/vlog.h"
 #include "ipc/ipc_path_manager.h"
 
 #ifdef _WIN32
 #include <wil/resource.h>
 #include <windows.h>
+
+#include "base/vlog.h"
 #else  // _WIN32
 #include <errno.h>
 #include <signal.h>

src/ipc/ipc.h

@@ -30,6 +30,7 @@
 #ifndef MOZC_IPC_IPC_H_
 #define MOZC_IPC_IPC_H_
 
+#include <cstddef>
 #include <cstdint>
 #include <memory>
 #include <string>

src/ipc/ipc_main.cc

@@ -34,10 +34,11 @@
 #include <vector>
 
 #include "absl/flags/flag.h"
+#include "absl/log/check.h"
+#include "absl/log/log.h"
 #include "absl/strings/string_view.h"
 #include "absl/time/time.h"
 #include "base/init_mozc.h"
-#include "base/logging.h"
 #include "base/thread.h"
 #include "ipc/ipc.h"
 

src/ipc/ipc_path_manager.cc

@@ -40,14 +40,14 @@
 #include <utility>
 
 #include "absl/container/flat_hash_map.h"
+#include "absl/log/check.h"
+#include "absl/log/log.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_format.h"
 #include "absl/strings/string_view.h"
 #include "absl/synchronization/mutex.h"
-#include "base/const.h"
 #include "base/file_stream.h"
 #include "base/file_util.h"
-#include "base/logging.h"
 #include "base/port.h"
 #include "base/process_mutex.h"
 #include "base/random.h"
@@ -75,6 +75,7 @@
 // clang-format on
 #include <wil/resource.h>
 
+#include "base/const.h"
 #include "base/unverified_sha1.h"
 #include "base/win32/wide_char.h"
 #include "base/win32/win_util.h"

src/ipc/ipc_path_manager_main.cc

@@ -30,9 +30,11 @@
 #include <string>
 
 #include "absl/flags/flag.h"
+#include "absl/log/check.h"
+#include "absl/log/log.h"
 #include "absl/time/clock.h"
+#include "absl/time/time.h"
 #include "base/init_mozc.h"
-#include "base/logging.h"
 #include "ipc/ipc_path_manager.h"
 
 ABSL_FLAG(bool, client, false, "client mode");

src/ipc/ipc_test_util.cc

@@ -34,7 +34,11 @@
 #include <memory>
 #include <string>
 
-#include "base/logging.h"
+#include "ipc/ipc.h"
+
+#ifdef __APPLE__
+#include "absl/log/check.h"
+#endif  // __APPLE__
 
 namespace mozc {
 #ifdef __APPLE__

src/ipc/mach_ipc.cc

@@ -37,8 +37,8 @@
 #include <cstdint>
 #include <map>
 
+#include "absl/log/log.h"
 #include "absl/time/time.h"
-#include "base/logging.h"
 #include "base/mac/mac_util.h"
 #include "base/singleton.h"
 #include "base/vlog.h"

src/ipc/named_event.cc

@@ -31,15 +31,16 @@
 
 #include <algorithm>
 #include <cstddef>
+#include <cstdint>
 #include <string>
 
+#include "absl/log/log.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_format.h"
 #include "absl/time/clock.h"
 #include "absl/time/time.h"
 #include "base/const.h"
 #include "base/hash.h"
-#include "base/logging.h"
 #include "base/system_util.h"
 #include "base/vlog.h"
 

src/ipc/named_event_main.cc

@@ -27,13 +27,15 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+#include <cstddef>
 #include <cstdint>
 #include <string>
 
 #include "absl/flags/flag.h"
+#include "absl/log/check.h"
+#include "absl/log/log.h"
 #include "absl/time/time.h"
 #include "base/init_mozc.h"
-#include "base/logging.h"
 #include "ipc/named_event.h"
 
 ABSL_FLAG(bool, listener, true, "listener mode");

src/ipc/process_watch_dog.cc

@@ -31,19 +31,19 @@
 
 #include <utility>
 
+#include "absl/log/log.h"
 #include "absl/synchronization/mutex.h"
 #include "absl/time/time.h"
-#include "base/logging.h"
 #include "base/port.h"
 #include "base/thread.h"
-#include "base/vlog.h"
 
 #ifdef _WIN32
 // clang-format off
 #include <windows.h>  // wil/resource.h requires windows.h for events
 // clang-format on
 #include <wil/resource.h>
 
+#include "base/vlog.h"
 #include "base/win32/hresult.h"
 #else  // _WIN32
 #include <errno.h>

src/ipc/process_watch_dog_test.cc

@@ -31,10 +31,10 @@
 
 #include <cstdlib>
 
+#include "absl/log/log.h"
 #include "absl/time/clock.h"
 #include "absl/time/time.h"
 #include "base/clock.h"
-#include "base/logging.h"
 #include "testing/gunit.h"
 
 namespace mozc {

src/ipc/unix_ipc.cc

@@ -44,12 +44,13 @@
 #include <cstring>
 #include <string>
 
+#include "absl/log/check.h"
+#include "absl/log/log.h"
 #include "absl/status/status.h"
 #include "absl/strings/str_format.h"
 #include "absl/strings/string_view.h"
 #include "absl/time/time.h"
 #include "base/file_util.h"
-#include "base/logging.h"
 #include "base/vlog.h"
 #include "ipc/ipc.h"
 #include "ipc/ipc_path_manager.h"

src/ipc/win32_ipc.cc

@@ -41,12 +41,13 @@
 #include <string>
 #include <utility>
 
+#include "absl/log/check.h"
+#include "absl/log/log.h"
 #include "absl/strings/match.h"
 #include "absl/strings/string_view.h"
 #include "absl/time/time.h"
 #include "base/const.h"
 #include "base/cpu_stats.h"
-#include "base/logging.h"
 #include "base/singleton.h"
 #include "base/system_util.h"
 #include "base/util.h"