Remove hardcoding of appurify address information.

Add AMP support to test runner.

BUG=428729

Review URL: https://codereview.chromium.org/803643002

Cr-Commit-Position: refs/heads/master@{#308188}

build/android/pylib/remote/device/remote_device_environment.py

@@ -46,9 +46,18 @@ class RemoteDeviceEnvironment(environment.Environment):
     else:
       error_func('Must set api secret with --api-secret or --api-secret-file')
 
+    if not args.api_protocol:
+      error_func('Must set api protocol with --api-protocol. Example: http')
     self._api_protocol = args.api_protocol
+
+    if not args.api_address:
+      error_func('Must set api address with --api-address')
     self._api_address = args.api_address
+
+    if not args.api_port:
+      error_func('Must set api port with --api-port.')
     self._api_port = args.api_port
+
     self._access_token = ''
     self._results_path = args.results_path
     self._remote_device = args.remote_device

build/android/test_runner.py

@@ -134,12 +134,10 @@ def AddRemoteDeviceOptions(parser):
                    help=('OS to have on the device.'))
   group.add_argument('--results-path', default='',
                    help=('File path to download results to.'))
-  group.add_argument('--api-protocol', default='http',
+  group.add_argument('--api-protocol',
                    help=('HTTP protocol to use. (http or https)'))
-  group.add_argument('--api-address', default='172.22.21.180',
-                   help=('Address to send HTTP requests.'))
-  group.add_argument('--api-port', default='80',
-                   help=('Port to send HTTP requests to.'))
+  group.add_argument('--api-address', help=('Address to send HTTP requests.'))
+  group.add_argument('--api-port', help=('Port to send HTTP requests to.'))
   group.add_argument('--runner-type', default='',
                    help=('Type of test to run as.'))
   group.add_argument('--runner-package', default='',