[Android] Make cmdline_file argument to FlagChanger mandatory.

build/android/pylib/instrumentation/test_runner.py

Index: build/android/pylib/instrumentation/test_runner.py
diff --git a/build/android/pylib/instrumentation/test_runner.py b/build/android/pylib/instrumentation/test_runner.py
index e87de15b0f4e2dcc4b684a3c446146de2568abbe..dda8162ba6c12d44af20fc5ec3540bd39994911f 100644
--- a/build/android/pylib/instrumentation/test_runner.py
+++ b/build/android/pylib/instrumentation/test_runner.py
@@ -82,10 +82,10 @@ class TestRunner(base_test_runner.BaseTestRunner):
     assert len(cmdline_file) < 2, 'Multiple packages have the same test package'
     if len(cmdline_file) and cmdline_file[0]:
       self.flags = flag_changer.FlagChanger(self.adb, cmdline_file[0])
+      if additional_flags:
+        self.flags.AddFlags(additional_flags)
     else:
-      self.flags = flag_changer.FlagChanger(self.adb)
-    if additional_flags:
-      self.flags.AddFlags(additional_flags)
+      self.flags = None

[navabi, 2013/12/19 22:51:17]

Is it ok that this is now None? Is there anywhere besides
build/android/pylib/uiautomator/test_runner.py that expects this to be a
FlagChanger instance?

[frankf, 2013/12/20 20:22:17]

Yea, these are all the instances.

On 2013/12/19 22:51:17, navabi wrote:

 
   #override
   def InstallTestPackage(self):
@@ -154,11 +154,13 @@ class TestRunner(base_test_runner.BaseTestRunner):
     # launch lighttpd with same port at same time.
     http_server_ports = self.LaunchTestHttpServer(
         os.path.join(constants.DIR_SOURCE_ROOT), self._lighttp_port)
-    self.flags.AddFlags(['--disable-fre', '--enable-test-intents'])
+    if self.flags:
+      self.flags.AddFlags(['--disable-fre', '--enable-test-intents'])
 
   def TearDown(self):
     """Cleans up the test harness and saves outstanding data from test run."""
-    self.flags.Restore()
+    if self.flags:
+      self.flags.Restore()
     super(TestRunner, self).TearDown()
 
   def TestSetup(self, test):