[tools/android] Replace FlagReplacer with flag_changer equivalent

tools/android/loading/controller.py

 # Copyright 2016 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.
 
 """Controller objects that control the context in which chrome runs.
 
 This is responsible for the setup necessary for launching chrome, and for
 creating a DevToolsConnection. There are remote device and local
 desktop-specific versions.
 """
@@ skipping 22 matching lines @@
 import devtools_monitor
 import emulation
 from options import OPTIONS
 
 _SRC_DIR = os.path.abspath(os.path.join(
     os.path.dirname(__file__), '..', '..', '..'))
 _CATAPULT_DIR = os.path.join(_SRC_DIR, 'third_party', 'catapult')
 
 sys.path.append(os.path.join(_CATAPULT_DIR, 'devil'))
 from devil.android import device_errors
+from devil.android import flag_changer
 from devil.android.sdk import intent
 
 sys.path.append(
     os.path.join(_CATAPULT_DIR, 'telemetry', 'third_party', 'websocket-client'))
 import websocket
 
 
 class ChromeControllerMetadataGatherer(object):
   """Gather metadata for the ChromeControllerBase."""
 
@@ skipping 265 matching lines @@
     return self._device
 
   @contextlib.contextmanager
   def Open(self):
     """Overridden connection creation."""
     if self._wpr_attributes:
       assert self._wpr_attributes.chrome_env_override == {}, \
           'Remote controller doesn\'t support chrome environment variables.'
     package_info = OPTIONS.ChromePackage()
     self._device.ForceStop(package_info.package)
-    with device_setup.FlagReplacer(
+    with flag_changer.CustomCommandLineFlags(
         self._device, package_info.cmdline_file, self._GetChromeArguments()):
       self._DismissCrashDialogIfNeeded()
       start_intent = intent.Intent(
           package=package_info.package, activity=package_info.activity,
           data='about:blank')
       self._device.adb.Logcat(clear=True, dump=True)
       self._device.StartActivity(start_intent, blocking=True)
       try:
         for attempt_id in xrange(self.DEVTOOLS_CONNECTION_ATTEMPTS):
           logging.info('Devtools connection attempt %d' % attempt_id)
@@ skipping 281 matching lines @@
     if (not os.path.isdir(self._profile_dir) or
         os.listdir(self._profile_dir) == []):
       # Launch chrome so that it populates the profile directory.
       with self.Open():
         pass
     assert os.path.isdir(self._profile_dir)
     assert os.path.isdir(os.path.dirname(self._GetCacheDirectoryPath()))
 
   def _GetCacheDirectoryPath(self):
     return os.path.join(self._profile_dir, 'Default', 'Cache')