Clean up IWYU warnings for eDO code base.

AlbertWang0116 · mobile-devx-github-bot · commit 1c59aa78db88 · 2021-03-11T19:02:49.000-08:00
PiperOrigin-RevId: 362428379
diff --git a/Channel/Sources/EDOChannelForwarder.m b/Channel/Sources/EDOChannelForwarder.m
@@ -16,9 +16,9 @@
 
 #import "Channel/Sources/EDOChannelForwarder.h"
 
-#import "Channel/Sources/EDOChannelPool.h"
+#import "Channel/Sources/EDOChannel.h"
+#import "Channel/Sources/EDOChannelErrors.h"
 #import "Channel/Sources/EDOHostPort.h"
-#import "Channel/Sources/EDOSocketChannel.h"
 
 /**
  *  Creates a receiveHandler for the multiplexer to receive the data and forwards to the forwarded
diff --git a/Channel/Sources/EDOChannelMultiplexer.m b/Channel/Sources/EDOChannelMultiplexer.m
@@ -17,6 +17,7 @@
 #import "Channel/Sources/EDOChannelMultiplexer.h"
 
 #import "Channel/Sources/EDOBlockingQueue.h"
+#import "Channel/Sources/EDOChannel.h"
 #import "Channel/Sources/EDOHostPort.h"
 #import "Channel/Sources/EDOSocket.h"
 #import "Channel/Sources/EDOSocketChannel.h"
diff --git a/Channel/Sources/EDOChannelPool.m b/Channel/Sources/EDOChannelPool.m
@@ -17,6 +17,7 @@
 #import "Channel/Sources/EDOChannelPool.h"
 
 #import "Channel/Sources/EDOBlockingQueue.h"
+#import "Channel/Sources/EDOChannel.h"
 #import "Channel/Sources/EDOChannelErrors.h"
 #import "Channel/Sources/EDOHostPort.h"
 #import "Channel/Sources/EDOSocket.h"
diff --git a/Channel/Sources/EDOListenSocket.m b/Channel/Sources/EDOListenSocket.m
@@ -22,7 +22,7 @@
 #include <stdatomic.h>
 #include <sys/un.h>
 
-#import "Channel/Sources/EDOSocketPort.h"
+#import "Channel/Sources/EDOSocket.h"
 
 static char const *gListenSocketQueueLabel = "com.google.edo.socketListen";
 
diff --git a/Channel/Sources/EDOSocketChannel.m b/Channel/Sources/EDOSocketChannel.m
@@ -21,10 +21,9 @@
 #include <netinet/tcp.h>
 #include <sys/un.h>
 
+#import "Channel/Sources/EDOChannel.h"
 #import "Channel/Sources/EDOChannelUtil.h"
-#import "Channel/Sources/EDOHostPort.h"
 #import "Channel/Sources/EDOSocket.h"
-#import "Channel/Sources/EDOSocketPort.h"
 
 #pragma mark - Socket Connection Extension
 
diff --git a/Channel/Tests/EDOChannelForwarderTest.m b/Channel/Tests/EDOChannelForwarderTest.m
@@ -16,6 +16,8 @@
 
 #import <XCTest/XCTest.h>
 
+#import "Channel/Sources/EDOChannel.h"
+#import "Channel/Sources/EDOChannelErrors.h"
 #import "Channel/Sources/EDOChannelForwarder.h"
 #import "Channel/Sources/EDOChannelMultiplexer.h"
 #import "Channel/Sources/EDOHostPort.h"
diff --git a/Channel/Tests/EDOChannelMultiplexerTest.m b/Channel/Tests/EDOChannelMultiplexerTest.m
@@ -16,6 +16,7 @@
 
 #import <XCTest/XCTest.h>
 
+#import "Channel/Sources/EDOChannel.h"
 #import "Channel/Sources/EDOChannelMultiplexer.h"
 #import "Channel/Sources/EDOHostPort.h"
 #import "Channel/Sources/EDOSocket.h"
diff --git a/Channel/Tests/EDOChannelPoolTest.m b/Channel/Tests/EDOChannelPoolTest.m
@@ -16,6 +16,7 @@
 
 #import <XCTest/XCTest.h>
 
+#import "Channel/Sources/EDOChannel.h"
 #import "Channel/Sources/EDOChannelPool.h"
 #import "Channel/Sources/EDOHostPort.h"
 #import "Channel/Sources/EDOSocket.h"
diff --git a/Channel/Tests/EDOSocketChannelTest.m b/Channel/Tests/EDOSocketChannelTest.m
@@ -16,7 +16,7 @@
 
 #import <XCTest/XCTest.h>
 
-#import "Channel/Sources/EDOHostPort.h"
+#import "Channel/Sources/EDOChannel.h"
 #import "Channel/Sources/EDOSocket.h"
 #import "Channel/Sources/EDOSocketChannel.h"
 #import "Channel/Sources/EDOSocketPort.h"
diff --git a/DeviceForwarder/Sources/EDODeviceForwardersManager.m b/DeviceForwarder/Sources/EDODeviceForwardersManager.m
@@ -16,6 +16,7 @@
 
 #import "DeviceForwarder/Sources/EDODeviceForwardersManager.h"
 
+#import "Channel/Sources/EDOChannelErrors.h"
 #import "Channel/Sources/EDOChannelForwarder.h"
 #import "Channel/Sources/EDOHostPort.h"
 #import "Channel/Sources/EDOSocket.h"
diff --git a/DeviceForwarder/Tests/EDODeviceForwardersManagerTest.m b/DeviceForwarder/Tests/EDODeviceForwardersManagerTest.m
@@ -18,7 +18,6 @@
 
 #import <XCTest/XCTest.h>
 
-#import "Channel/Sources/EDOChannel.h"
 #import "Channel/Sources/EDOChannelMultiplexer.h"
 #import "Channel/Sources/EDOHostPort.h"
 #import "Channel/Sources/EDOSocket.h"
diff --git a/Service/Sources/EDOClassMessage.m b/Service/Sources/EDOClassMessage.m
@@ -18,6 +18,9 @@
 
 #import "Channel/Sources/EDOHostPort.h"
 #import "Service/Sources/EDOHostService+Private.h"
+#import "Service/Sources/EDOHostService.h"
+#import "Service/Sources/EDOMessage.h"
+#import "Service/Sources/EDOServiceRequest.h"
 
 static NSString *const kEDOObjectCoderClassNameKey = @"className";
 static NSString *const kEDOObjectCoderHostPortKey = @"hostPort";
diff --git a/Service/Sources/EDODeallocationTracker.m b/Service/Sources/EDODeallocationTracker.m
@@ -19,6 +19,8 @@
 #include <objc/runtime.h>
 
 #import "Service/Sources/EDOClientService+Private.h"
+#import "Service/Sources/EDOClientService.h"
+#import "Service/Sources/EDOObject+Private.h"
 #import "Service/Sources/EDOObjectReleaseMessage.h"
 #import "Service/Sources/EDOWeakObject.h"
 
diff --git a/Service/Sources/EDOHostService+Handlers.m b/Service/Sources/EDOHostService+Handlers.m
@@ -22,6 +22,7 @@
 #import "Service/Sources/EDOObjectAliveMessage.h"
 #import "Service/Sources/EDOObjectMessage.h"
 #import "Service/Sources/EDOObjectReleaseMessage.h"
+#import "Service/Sources/EDOServiceRequest.h"
 
 @implementation EDOHostService (Handlers)
 
diff --git a/Service/Sources/EDOInvocationMessage.m b/Service/Sources/EDOInvocationMessage.m
@@ -21,12 +21,18 @@
 #import "Channel/Sources/EDOHostPort.h"
 #import "Service/Sources/EDOBlockObject.h"
 #import "Service/Sources/EDOClientService+Private.h"
+#import "Service/Sources/EDOClientService.h"
 #import "Service/Sources/EDOHostService+Private.h"
+#import "Service/Sources/EDOHostService.h"
+#import "Service/Sources/EDOMessage.h"
+#import "Service/Sources/EDOObject+Private.h"
+#import "Service/Sources/EDOObject.h"
 #import "Service/Sources/EDOParameter.h"
+#import "Service/Sources/EDORemoteException.h"
 #import "Service/Sources/EDORuntimeUtils.h"
 #import "Service/Sources/EDOServiceException.h"
 #import "Service/Sources/EDOServicePort.h"
-#import "Service/Sources/EDOWeakObject.h"
+#import "Service/Sources/EDOServiceRequest.h"
 #import "Service/Sources/NSObject+EDOParameter.h"
 #import "Service/Sources/NSObject+EDOValue.h"
 
diff --git a/Service/Sources/EDOMethodSignatureMessage.m b/Service/Sources/EDOMethodSignatureMessage.m
@@ -17,8 +17,11 @@
 #import "Service/Sources/EDOMethodSignatureMessage.h"
 
 #import "Service/Sources/EDOHostService.h"
+#import "Service/Sources/EDOMessage.h"
+#import "Service/Sources/EDOObject+Private.h"
 #import "Service/Sources/EDORuntimeUtils.h"
 #import "Service/Sources/EDOServicePort.h"
+#import "Service/Sources/EDOServiceRequest.h"
 
 #import <objc/runtime.h>
 
diff --git a/Service/Sources/EDOObject+EDOParameter.m b/Service/Sources/EDOObject+EDOParameter.m
@@ -14,6 +14,8 @@
 // limitations under the License.
 //
 
+#import "Service/Sources/EDOObject.h"
+
 #import "Service/Sources/EDOParameter.h"
 
 @class EDOHostService;
diff --git a/Service/Sources/EDOObject.m b/Service/Sources/EDOObject.m
@@ -18,18 +18,14 @@
 
 #include <objc/runtime.h>
 
-#import "Channel/Sources/EDOSocket.h"
-#import "Channel/Sources/EDOSocketChannel.h"
 #import "Service/Sources/EDOClientService+Private.h"
 #import "Service/Sources/EDOClientService.h"
 #import "Service/Sources/EDOObject+Private.h"
 #import "Service/Sources/EDOObjectReleaseMessage.h"
 #import "Service/Sources/EDOParameter.h"
 #import "Service/Sources/EDOServiceException.h"
 #import "Service/Sources/EDOServicePort.h"
-#import "Service/Sources/EDOServiceRequest.h"
 #import "Service/Sources/EDOValueObject.h"
-#import "Service/Sources/EDOWeakObject.h"
 
 static NSString *const kEDOObjectCoderPortKey = @"edoServicePort";
 static NSString *const kEDOObjectCoderRemoteAddressKey = @"edoRemoteAddress";
diff --git a/Service/Sources/EDOObjectAliveMessage.m b/Service/Sources/EDOObjectAliveMessage.m
@@ -18,6 +18,10 @@
 
 #import "Service/Sources/EDOBlockObject.h"
 #import "Service/Sources/EDOHostService+Private.h"
+#import "Service/Sources/EDOHostService.h"
+#import "Service/Sources/EDOMessage.h"
+#import "Service/Sources/EDOObject.h"
+#import "Service/Sources/EDOServiceRequest.h"
 
 static NSString *const kEDOObjectAliveCoderObjectKey = @"object";
 
diff --git a/Service/Sources/EDOObjectMessage.m b/Service/Sources/EDOObjectMessage.m
@@ -18,6 +18,10 @@
 
 #import "Channel/Sources/EDOHostPort.h"
 #import "Service/Sources/EDOHostService+Private.h"
+#import "Service/Sources/EDOHostService.h"
+#import "Service/Sources/EDOMessage.h"
+#import "Service/Sources/EDOObject.h"
+#import "Service/Sources/EDOServiceRequest.h"
 
 static NSString *const kEDOObjectCoderObjectKey = @"object";
 static NSString *const kEDOObjectCoderHostPortKey = @"hostPort";
diff --git a/Service/Sources/EDOObjectReleaseMessage.m b/Service/Sources/EDOObjectReleaseMessage.m
@@ -15,6 +15,9 @@
 //
 
 #import "Service/Sources/EDOObjectReleaseMessage.h"
+#import "Service/Sources/EDOHostService.h"
+#import "Service/Sources/EDOMessage.h"
+#import "Service/Sources/EDOObject+Private.h"
 #import "Service/Sources/EDOServiceRequest.h"
 
 #import "Service/Sources/EDOHostService+Private.h"
diff --git a/Service/Sources/EDOParameter.m b/Service/Sources/EDOParameter.m
@@ -17,7 +17,6 @@
 #import "Service/Sources/EDOParameter.h"
 
 #import "Service/Sources/EDOBlockObject.h"
-#import "Service/Sources/EDOObject+Private.h"
 #import "Service/Sources/EDOObject.h"
 
 static NSString *const kObjCIdType = @"@";
diff --git a/Service/Sources/EDOServiceRequest.m b/Service/Sources/EDOServiceRequest.m
@@ -16,6 +16,7 @@
 
 #import "Service/Sources/EDOServiceRequest.h"
 
+#import "Service/Sources/EDOMessage.h"
 #import "Service/Sources/EDOServiceError.h"
 
 static NSString *const kEDOServiceResponseErrorKey = @"error";
diff --git a/Service/Sources/EDOValueObject+EDOParameter.m b/Service/Sources/EDOValueObject+EDOParameter.m
@@ -14,6 +14,7 @@
 // limitations under the License.
 //
 
+#import "Service/Sources/EDOObject.h"
 #import "Service/Sources/EDOParameter.h"
 #import "Service/Sources/EDOValueObject.h"
 
diff --git a/Service/Sources/EDOValueObject.m b/Service/Sources/EDOValueObject.m
@@ -19,6 +19,7 @@
 #include <objc/runtime.h>
 
 #import "Service/Sources/EDOObject+Private.h"
+#import "Service/Sources/EDOObject.h"
 
 @implementation EDOValueObject
 
diff --git a/Service/Sources/EDOWeakObject.m b/Service/Sources/EDOWeakObject.m
@@ -20,8 +20,8 @@
 
 #import "Service/Sources/EDOBlockObject.h"
 #import "Service/Sources/EDODeallocationTracker.h"
-#import "Service/Sources/EDOHostService+Private.h"
-#import "Service/Sources/EDOParameter.h"
+#import "Service/Sources/EDOObject+Private.h"
+#import "Service/Sources/EDOObject.h"
 #import "Service/Sources/EDOServiceException.h"
 #import "Service/Sources/EDOServicePort.h"
 #import "Service/Sources/NSProxy+EDOParameter.h"
diff --git a/Service/Sources/NSBlock+EDOInvocation.m b/Service/Sources/NSBlock+EDOInvocation.m
@@ -17,10 +17,11 @@
 #import <Foundation/Foundation.h>
 #include <objc/runtime.h>
 
-#import "Channel/Sources/EDOHostPort.h"
 #import "Service/Sources/EDOBlockObject.h"
 #import "Service/Sources/EDOHostService+Private.h"
+#import "Service/Sources/EDOHostService.h"
 #import "Service/Sources/EDOObject+Private.h"
+#import "Service/Sources/EDOObject.h"
 #import "Service/Sources/EDOParameter.h"
 
 /** Expose the private class interface. */
diff --git a/Service/Sources/NSObject+EDOBlockedType.m b/Service/Sources/NSObject+EDOBlockedType.m
@@ -17,9 +17,6 @@
 
 #include <objc/runtime.h>
 
-#import "Channel/Sources/EDOHostPort.h"
-#import "Service/Sources/EDOHostService.h"
-#import "Service/Sources/EDOObject.h"
 #import "Service/Sources/EDOServiceException.h"
 #import "Service/Sources/NSObject+EDOParameter.h"
 
diff --git a/Service/Sources/NSObject+EDOParameter.m b/Service/Sources/NSObject+EDOParameter.m
@@ -18,8 +18,8 @@
 
 #include <objc/runtime.h>
 
-#import "Channel/Sources/EDOHostPort.h"
 #import "Service/Sources/EDOHostService+Private.h"
+#import "Service/Sources/EDOHostService.h"
 #import "Service/Sources/EDOParameter.h"
 #import "Service/Sources/EDOProtocolObject.h"
 #import "Service/Sources/NSObject+EDOValue.h"
diff --git a/Service/Sources/NSProxy+EDOParameter.m b/Service/Sources/NSProxy+EDOParameter.m
@@ -16,8 +16,8 @@
 
 #import "Service/Sources/NSProxy+EDOParameter.h"
 
-#import "Channel/Sources/EDOHostPort.h"
 #import "Service/Sources/EDOHostService+Private.h"
+#import "Service/Sources/EDOHostService.h"
 #import "Service/Sources/EDOParameter.h"
 
 @implementation NSProxy (EDOParameter)
diff --git a/Service/Tests/FunctionalTests/EDOTestDummyInTest.m b/Service/Tests/FunctionalTests/EDOTestDummyInTest.m
@@ -16,7 +16,6 @@
 
 #import "Service/Tests/FunctionalTests/EDOTestDummyInTest.h"
 
-#import "Service/Sources/NSObject+EDOWeakObject.h"
 #import "Service/Tests/TestsBundle/EDOTestDummy.h"
 
 // Also define this in the test process.
diff --git a/Service/Tests/MacHost/Host/main.m b/Service/Tests/MacHost/Host/main.m
@@ -17,9 +17,7 @@
 #import <Foundation/Foundation.h>
 
 #import "Device/Sources/EDODeviceConnector.h"
-#import "Service/Sources/EDOHostService.h"
 #import "Service/Tests/MacHost/Host/ServiceRegistrationHelper.h"
-#import "Service/Tests/TestsBundle/EDOTestDummy.h"
 
 // Default service registration timeout.
 const NSTimeInterval kDefaultTimeout = 1000;
diff --git a/Service/Tests/UnitTests/EDOHostNamingServiceTest.m b/Service/Tests/UnitTests/EDOHostNamingServiceTest.m
@@ -18,9 +18,9 @@
 
 #import "Channel/Sources/EDOChannelPool.h"
 #import "Channel/Sources/EDOHostPort.h"
-#import "Service/Sources/EDOClientService+Private.h"
+#import "Service/Sources/EDOClientService.h"
 #import "Service/Sources/EDOHostNamingService+Private.h"
-#import "Service/Sources/EDOHostService.h"
+#import "Service/Sources/EDOHostNamingService.h"
 #import "Service/Sources/EDOServicePort.h"
 
 static NSString *const kDummyServiceName = @"com.google.testService";
diff --git a/Service/Tests/UnitTests/EDOMessageTest.m b/Service/Tests/UnitTests/EDOMessageTest.m
@@ -20,14 +20,16 @@
 
 #import "Channel/Sources/EDOHostPort.h"
 #import "Service/Sources/EDOClassMessage.h"
-#import "Service/Sources/EDOClientService+Private.h"
+#import "Service/Sources/EDOClientService.h"
 #import "Service/Sources/EDOHostService+Private.h"
+#import "Service/Sources/EDOHostService.h"
 #import "Service/Sources/EDOInvocationMessage.h"
 #import "Service/Sources/EDOMethodSignatureMessage.h"
 #import "Service/Sources/EDOObject+Private.h"
+#import "Service/Sources/EDOObject.h"
 #import "Service/Sources/EDOObjectMessage.h"
-#import "Service/Sources/EDOParameter.h"
-#import "Service/Sources/EDORuntimeUtils.h"
+#import "Service/Sources/EDOParameter.h"  // IWYU pragma: keep
+#import "Service/Sources/EDORemoteException.h"
 #import "Service/Sources/EDOServicePort.h"
 
 #import "Service/Tests/TestsBundle/EDOTestDummy.h"
diff --git a/Service/Tests/UnitTests/EDORemoteExceptionTest.m b/Service/Tests/UnitTests/EDORemoteExceptionTest.m
@@ -16,10 +16,7 @@
 
 #import <XCTest/XCTest.h>
 
-#import "Service/Sources/EDOBlockObject.h"
-#import "Service/Sources/EDOObject+Private.h"
 #import "Service/Sources/EDORemoteException.h"
-#import "Service/Sources/EDOServicePort.h"
 #import "Service/Sources/NSKeyedArchiver+EDOAdditions.h"
 #import "Service/Sources/NSKeyedUnarchiver+EDOAdditions.h"
 
