Android: removes old "keep_test_server_ports".

build/android/test_runner.py

Index: build/android/test_runner.py
diff --git a/build/android/test_runner.py b/build/android/test_runner.py
index fa3e785da34a5a24b564aa5875467cc2f7343d93..cce62e7ea7cbea55512dd2e1598b048edc0d800e 100755
--- a/build/android/test_runner.py
+++ b/build/android/test_runner.py
@@ -171,12 +171,6 @@ def AddJavaTestOptions(option_parser):
                            help='Saves the JSON file for each UI Perf test.')
   option_parser.add_option('--official-build', action='store_true',
                            help='Run official build tests.')
-  option_parser.add_option('--keep_test_server_ports',
-                           action='store_true',
-                           help=('Indicates the test server ports must be '
-                                 'kept. When this is run via a sharder '
-                                 'the test server ports should be kept and '
-                                 'should not be reset.'))
   option_parser.add_option('--test_data', action='append', default=[],
                            help=('Each instance defines a directory of test '
                                  'data that should be copied to the target(s) '
@@ -203,9 +197,8 @@ def ProcessJavaTestOptions(options, error_func):
   else:
     options.exclude_annotations = []
 
-  if not options.keep_test_server_ports:
-    if not ports.ResetTestServerPortAllocation():
-      raise Exception('Failed to reset test server port.')
+  if not ports.ResetTestServerPortAllocation():

[frankf, 2013/11/15 18:43:30]

Can you unify all such calls into one? gtest/setup.py and perf/setup.py have
identical statements.

[bulach, 2013/11/15 18:56:33]

good point! done.

+    raise Exception('Failed to reset test server port.')
 
 
 def AddInstrumentationTestOptions(option_parser):