Refactor: Make PyAuto InstallExtension() take a string. Delete dead code.

chrome/test/functional/chromeos_security.py

 #!/usr/bin/python
 # Copyright (c) 2011 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.
 
 import os
 import pprint
 
 import pyauto_functional
 import pyauto
@@ skipping 152 matching lines @@
     self._VerifyExtensionPermissions(self._component_extension_baseline)
 
   def testBundledCrxPermissions(self):
     """Ensures bundled CRX permissions are as expected."""
     # Verify that each bundled CRX on the device is expected, then install it.
     for file_name in os.listdir(self._bundled_crx_directory):
       if file_name.endswith('.crx'):
         self.assertTrue(
             file_name in [x['crx_file'] for x in self._bundled_crx_baseline],
             msg='Unexpected CRX file: ' + file_name)
-        crx_file = pyauto.FilePath(
-            os.path.join(self._bundled_crx_directory, file_name))
+        crx_file = os.path.join(self._bundled_crx_directory, file_name)
         self.assertTrue(self.InstallExtension(crx_file, False),
-                        msg='Extension install failed: %s' % crx_file.value())
+                        msg='Extension install failed: %s' % crx_file)
 
     # Verify that the permissions information in the baseline matches the
     # permissions associated with the installed bundled CRX extensions.
     self._VerifyExtensionPermissions(self._bundled_crx_baseline)
 
   def testNoUnexpectedExtensions(self):
     """Ensures there are no unexpected bundled or component extensions."""
     # Install all bundled extensions on the device.
     for file_name in os.listdir(self._bundled_crx_directory):
       if file_name.endswith('.crx'):
-        crx_file = pyauto.FilePath(
-            os.path.join(self._bundled_crx_directory, file_name))
+        crx_file = os.path.join(self._bundled_crx_directory, file_name)
         self.assertTrue(self.InstallExtension(crx_file, False),
-                        msg='Extension install failed: %s' % crx_file.value())
+                        msg='Extension install failed: %s' % crx_file)
 
     # Ensure that the set of installed extension names precisely matches the
     # baseline.
     expected_names = [ext['name'] for ext in self._component_extension_baseline]
     expected_names.extend([ext['name'] for ext in self._bundled_crx_baseline])
     ext_actual_info = self.GetExtensionsInfo()
     installed_names = [ext['name'] for ext in ext_actual_info]
     self._AssertExtensionNamesAreExpected(
         set(expected_names), set(installed_names), 'Installed extension',
         self._component_extension_baseline + self._bundled_crx_baseline,
         ext_actual_info)
 
 
 if __name__ == '__main__':
   pyauto_functional.Main()