| Index: build/android/pylib/instrumentation/instrumentation_test_instance_test.py
 | 
| diff --git a/build/android/pylib/instrumentation/instrumentation_test_instance_test.py b/build/android/pylib/instrumentation/instrumentation_test_instance_test.py
 | 
| index 301f95a191ffb5f173e81d2c7044dc7845fd03e0..a0bf46493462bf29145d6ddc630cb783d35ec3ee 100755
 | 
| --- a/build/android/pylib/instrumentation/instrumentation_test_instance_test.py
 | 
| +++ b/build/android/pylib/instrumentation/instrumentation_test_instance_test.py
 | 
| @@ -46,15 +46,13 @@ class InstrumentationTestInstanceTest(unittest.TestCase):
 | 
|          'command_line_flags',
 | 
|          'device_flags_file',
 | 
|          'strict_mode',
 | 
| -        'regenerate_goldens',
 | 
|        ])
 | 
|  
 | 
|    def createFlagAttributesArgs(
 | 
|        self, command_line_flags=None, device_flags_file=None,
 | 
| -      strict_mode=None, regenerate_goldens=None):
 | 
| +      strict_mode=None):
 | 
|      return self._FlagAttributesArgs(
 | 
| -        command_line_flags, device_flags_file, strict_mode,
 | 
| -        regenerate_goldens)
 | 
| +        command_line_flags, device_flags_file, strict_mode)
 | 
|  
 | 
|    def test_initializeFlagAttributes_commandLineFlags(self):
 | 
|      o = self.createTestInstance()
 | 
| @@ -84,13 +82,6 @@ class InstrumentationTestInstanceTest(unittest.TestCase):
 | 
|      o._initializeFlagAttributes(args)
 | 
|      self.assertEquals(o._flags, ['--enable-test-intents'])
 | 
|  
 | 
| -  def test_initializeFlagAttributes_regenerateGoldens(self):
 | 
| -    o = self.createTestInstance()
 | 
| -    args = self.createFlagAttributesArgs(regenerate_goldens=True)
 | 
| -    o._initializeFlagAttributes(args)
 | 
| -    self.assertEquals(
 | 
| -        o._flags, ['--enable-test-intents', '--regenerate-goldens'])
 | 
| -
 | 
|    def testGetTests_noFilter(self):
 | 
|      o = self.createTestInstance()
 | 
|      raw_tests = [
 | 
| 
 |