1 files changed, 12 insertions, 1 deletions
diff --git a/catapult/devil/devil/android/flag_changer_devicetest.py b/catapult/devil/devil/android/flag_changer_devicetest.py
index f5d19d60..b75504b5 100644
--- a/catapult/devil/devil/android/flag_changer_devicetest.py
+++ b/catapult/devil/devil/android/flag_changer_devicetest.py
@@ -39,10 +39,11 @@ class FlagChangerTest(device_test_case.DeviceTestCase):
         flag_changer._CMDLINE_DIR_LEGACY, _CMDLINE_FILE)
 
   def tearDown(self):
+    super(FlagChangerTest, self).tearDown()
     self.device.RemovePath(
         [self.cmdline_path, self.cmdline_path_legacy], force=True, as_root=True)
 
-  def testFlagChanger(self):
+  def testFlagChanger_restoreFlags(self):
     if not self.device.HasRoot():
       self.skipTest('Test needs a rooted device')
 
@@ -72,6 +73,16 @@ class FlagChangerTest(device_test_case.DeviceTestCase):
         changer.Restore(),
         ['--some', '--old', '--flags'])
 
+  def testFlagChanger_removeFlags(self):
+    self.device.RemovePath(self.cmdline_path, force=True)
+    self.assertFalse(self.device.PathExists(self.cmdline_path))
+
+    with flag_changer.CustomCommandLineFlags(
+        self.device, _CMDLINE_FILE, ['--some', '--flags']):
+      self.assertTrue(self.device.PathExists(self.cmdline_path))
+
+    self.assertFalse(self.device.PathExists(self.cmdline_path))
+
 
 if __name__ == '__main__':
   unittest.main()