[android] Update FlagChanger to work with additional apks.

build/android/pylib/base/base_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.
 
 """Base class for running tests on a single device."""
 
 import contextlib
 import httplib
 import logging
 import os
 import tempfile
 import time
 
 from pylib import android_commands
 from pylib import constants
 from pylib import ports
 from pylib.chrome_test_server_spawner import SpawningServer
-from pylib.flag_changer import FlagChanger
 from pylib.forwarder import Forwarder
 from pylib.valgrind_tools import CreateTool
 # TODO(frankf): Move this to pylib/utils
 import lighttpd_server
 
 
 # A file on device to store ports of net test server. The format of the file is
 # test-spawner-server-port:test-server-port
 NET_TEST_SERVER_PORT_INFO_FILE = 'net-test-server-ports'
 
 
 class BaseTestRunner(object):
   """Base class for running tests on a single device."""
 
   def __init__(self, device, tool, push_deps=True, cleanup_test_files=False):
     """
       Args:
         device: Tests will run on the device of this ID.
         tool: Name of the Valgrind tool.
         push_deps: If True, push all dependencies to the device.
         cleanup_test_files: Whether or not to cleanup test files on device.
     """
     self.device = device
     self.adb = android_commands.AndroidCommands(device=device)
     self.tool = CreateTool(tool, self.adb)
     self._http_server = None
     self._forwarder_device_port = 8000
     self.forwarder_base_url = ('http://localhost:%d' %
         self._forwarder_device_port)
-    self.flags = FlagChanger(self.adb)
-    self.flags.AddFlags(['--disable-fre'])
     self._spawning_server = None
     # We will allocate port for test server spawner when calling method
     # LaunchChromeTestServerSpawner and allocate port for test server when
     # starting it in TestServerThread.
     self.test_server_spawner_port = 0
     self.test_server_port = 0
     self._push_deps = push_deps
     self._cleanup_test_files = cleanup_test_files
 
   def _PushTestServerPortInfoToDevice(self):
@@ skipping 99 matching lines @@
     if not ports.IsDevicePortUsed(self.adb, self._forwarder_device_port):
       self._ForwardPortsForHttpServer()
 
   def ShutdownHelperToolsForTestSuite(self):
     """Shuts down the server and the forwarder."""
     if self._http_server:
       self._UnmapPorts([(self._forwarder_device_port, self._http_server.port)])
       self._http_server.ShutdownHttpServer()
     if self._spawning_server:
       self._spawning_server.Stop()
-    self.flags.Restore()
 
   def CleanupSpawningServerState(self):
     """Tells the spawning server to clean up any state.
 
     If the spawning server is reused for multiple tests, this should be called
     after each test to prevent tests affecting each other.
     """
     if self._spawning_server:
       self._spawning_server.CleanupState()
 
@@ skipping 20 matching lines @@
         break
       else:
         error_msgs.append(error_msg)
       self._spawning_server.Stop()
       # Wait for 2 seconds then restart.
       time.sleep(2)
     if not server_ready:
       logging.error(';'.join(error_msgs))
       raise Exception('Can not start the test spawner server.')
     self._PushTestServerPortInfoToDevice()