[android] Update FlagChanger to work with additional apks.

build/android/pylib/instrumentation/test_runner.py

 # Copyright (c) 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.
 
 """Class for running instrumentation tests on a single device."""
 
 import logging
 import os
 import re
 import time
 
 from pylib import android_commands
 from pylib import constants
+from pylib import flag_changer
 from pylib import json_perf_parser
 from pylib import perf_tests_helper
 from pylib import valgrind_tools
 from pylib.base import base_test_result
 from pylib.base import base_test_runner
 
 import test_result
 
 
 _PERF_TEST_ANNOTATION = 'PerfTest'
@@ skipping 40 matching lines @@
     """
     super(TestRunner, self).__init__(device, test_options.tool,
                                      test_options.push_deps,
                                      test_options.cleanup_test_files)
     self._lighttp_port = constants.LIGHTTPD_RANDOM_PORT_FIRST + shard_index
 
     self.options = test_options
     self.test_pkg = test_pkg
     self.ports_to_forward = ports_to_forward
     self.coverage_dir = test_options.coverage_dir
+    # Use the correct command line file for the package under test.
+    cmdline_file = [a.cmdline_file for a in constants.PACKAGE_INFO.itervalues()
+                    if a.test_package == self.test_pkg.GetPackageName()]
+    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])
+    else:
+      self.flags = flag_changer.FlagChanger(self.adb)
 
   #override
   def InstallTestPackage(self):
     self.test_pkg.Install(self.adb)
 
   #override
   def PushDataDeps(self):
     # TODO(frankf): Implement a general approach for copying/installing
     # once across test runners.
     if TestRunner._DEVICE_HAS_TEST_FILES.get(self.device, False):
@@ skipping 50 matching lines @@
       if self.adb.SetJavaAssertsEnabled(True):
         self.adb.Reboot(full_reboot=False)
 
     # We give different default value to launch HTTP server based on shard index
     # because it may have race condition when multiple processes are trying to
     # launch lighttpd with same port at same time.
     http_server_ports = self.LaunchTestHttpServer(
         os.path.join(constants.DIR_SOURCE_ROOT), self._lighttp_port)
     if self.ports_to_forward:
       self._ForwardPorts([(port, port) for port in self.ports_to_forward])
-    self.flags.AddFlags(['--enable-test-intents'])
+    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.ports_to_forward:
       self._UnmapPorts([(port, port) for port in self.ports_to_forward])
     super(TestRunner, self).TearDown()
 
   def TestSetup(self, test):
     """Sets up the test harness for running a particular test.
 
     Args:
       test: The name of the test that will be run.
     """
@@ skipping 195 matching lines @@
         duration_ms = 0
       message = str(e)
       if not message:
         message = 'No information.'
       results.AddResult(test_result.InstrumentationTestResult(
           test, base_test_result.ResultType.CRASH, start_date_ms, duration_ms,
           log=message))
       raw_result = None
     self.TestTeardown(test, raw_result)
     return (results, None if results.DidRunPass() else test)