[Android] Add --blacklist-file as a command-line option.

tools/telemetry/telemetry/internal/browser/browser_options.py

 # Copyright 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import copy
 import logging
 import optparse
 import os
 import shlex
 import socket
@@ skipping 32 matching lines @@
 
     self.cros_remote = None
 
     self.profiler = None
     self.verbosity = 0
 
     self.browser_options = BrowserOptions()
     self.output_file = None
 
     self.android_rndis = False
     self.no_performance_mode = False

[nednguyen, 2015/08/08 02:13:41]

Do you need to add self.android_black_list_file = None here?

[jbudorick, 2015/08/13 17:38:17]

Added.

 
   def __repr__(self):
     return str(sorted(self.__dict__.items()))
 
   def Copy(self):
     return copy.deepcopy(self)
 
   def CreateParser(self, *args, **kwargs):
     parser = optparse.OptionParser(*args, **kwargs)
 
@@ skipping 65 matching lines @@
     group.add_option('--no-performance-mode', action='store_true',
         help='Some platforms run on "full performance mode" where the '
         'test is executed at maximum CPU speed in order to minimize noise '
         '(specially important for dashboards / continuous builds). '
         'This option prevents Telemetry from tweaking such platform settings.')
     group.add_option('--android-rndis', dest='android_rndis', default=False,
         action='store_true', help='Use RNDIS forwarding on Android.')
     group.add_option('--no-android-rndis', dest='android_rndis',
         action='store_false', help='Do not use RNDIS forwarding on Android.'
         ' [default]')
+    group.add_option('--android-blacklist-file',
+                     help='Device blacklist JSON file.')
     parser.add_option_group(group)
 
     # Browser options.
     self.browser_options.AddCommandLineArgs(parser)
 
     real_parse = parser.parse_args
     def ParseArgs(args=None):
       defaults = parser.get_default_values()
       for k, v in defaults.__dict__.items():
         if k in self.__dict__ and self.__dict__[k] != None:
@@ skipping 267 matching lines @@
     # Disable GAIA/enterprise services.
     self.disable_gaia_services = True
 
     self.auto_login = True
     self.gaia_login = False
     self.username = 'test@test.test'
     self.password = ''
 
   def IsCrosBrowserOptions(self):
     return True