Kill USB server support

Summary: `iproxy` is much more handy than using our custom USB support. Time to simplify our life and kill it. Plus, we got ony one dependency now ;) Reviewed By: lawrencelomax Differential Revision: D4753457 fbshipit-source-id: 805ab7deeacf38c21eb312c6f87131fbdf5c4658

Author: Marek Cirkos

Cartfile

@@ -1,5 +1,2 @@
 # Used for HTTP routing
 github "marekcirkos/RoutingHTTPServer"
-
-# Used for USBOverHTTP
-github "marekcirkos/peertalk"

WebDriverAgent.xcodeproj/project.pbxproj

@@ -15,7 +15,6 @@
 #import "FBCommandHandler.h"
 #import "FBErrorBuilder.h"
 #import "FBExceptionHandler.h"
-#import "FBHTTPOverUSBServer.h"
 #import "FBRouteRequest.h"
 #import "FBRuntimeUtils.h"
 #import "FBSession.h"
@@ -45,7 +44,6 @@ - (void)handleResourceNotFound
 @interface FBWebServer ()
 @property (nonatomic, strong) FBExceptionHandler *exceptionHandler;
 @property (nonatomic, strong) RoutingHTTPServer *server;
-@property (nonatomic, strong) FBHTTPOverUSBServer *USBServer;
 @end
 
 @implementation FBWebServer
@@ -70,9 +68,6 @@ - (void)startServing
  [FBLogger logFmt:@"Built at %s %s", __DATE__, __TIME__];
  self.exceptionHandler = [FBExceptionHandler new];
  [self startHTTPServer];
- if (FBConfiguration.shouldListenOnUSB) {
- [self startUSBServer];
- }
  [[NSRunLoop mainRunLoop] run];
 }
 
@@ -109,12 +104,6 @@ - (void)startHTTPServer
  [FBLogger logFmt:@"%@http://%@:%d%@", FBServerURLBeginMarker, [XCUIDevice sharedDevice].fb_wifiIPAddress ?: @"localhost", [self.server port], FBServerURLEndMarker];
 }
 
-- (void)startUSBServer
-{
- self.USBServer = [[FBHTTPOverUSBServer alloc] initWithRoutingServer:self.server];
- [self.USBServer startServing];
-}
-
 - (BOOL)attemptToStartServer:(RoutingHTTPServer *)server onPort:(NSInteger)port withError:(NSError **)error
 {
  server.port = (UInt16)port;

WebDriverAgent.xcodeproj/xcshareddata/xcschemes/WebDriverAgentUSBClient.xcscheme

@@ -27,11 +27,6 @@ NS_ASSUME_NONNULL_BEGIN
  */
 + (NSRange)bindingPortRange;
 
-/**
- YES if should listen on USB. NO otherwise.
- */
-+ (BOOL)shouldListenOnUSB;
-
 /**
  YES if verbose logging is enabled. NO otherwise.
  */

WebDriverAgentLib/Routing/FBHTTPOverUSBServer.h

@@ -43,15 +43,6 @@ + (NSRange)bindingPortRange
  return NSMakeRange(DefaultStartingPort, DefaultPortRange);
 }
 
-+ (BOOL)shouldListenOnUSB
-{
-#if TARGET_OS_SIMULATOR
- return NO;
-#else
- return YES;
-#endif
-}
-
 + (BOOL)verboseLoggingEnabled
 {
  return [NSProcessInfo.processInfo.environment[@"VERBOSE_LOGGING"] boolValue];

WebDriverAgentLib/Routing/FBHTTPOverUSBServer.m

@@ -27,7 +27,6 @@ FOUNDATION_EXPORT const unsigned char WebDriverAgentLib_VersionString[];
 #import <WebDriverAgentLib/FBErrorBuilder.h>
 #import <WebDriverAgentLib/FBExceptionHandler.h>
 #import <WebDriverAgentLib/FBFailureProofTestCase.h>
-#import <WebDriverAgentLib/FBHTTPOverUSBServer.h>
 #import <WebDriverAgentLib/FBKeyboard.h>
 #import <WebDriverAgentLib/FBLogger.h>
 #import <WebDriverAgentLib/FBMacros.h>