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

chrome/test/functional/extensions.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.
 
 """
 This module is a simple qa tool that installs extensions and tests whether the
 browser crashes while visiting a list of urls.
 
 Usage: python extensions.py -v
@@ skipping 46 matching lines @@
     curr_extension = 0
     num_extensions = len(extensions)
     self.RestartBrowser()
     orig_extension_ids = self._GetInstalledExtensionIds()
 
     while curr_extension < num_extensions:
       logging.debug('New group of %d extensions.' % group_size)
       group_end = curr_extension + group_size
       for extension in extensions[curr_extension:group_end]:
         logging.debug('Installing extension: %s' % extension)
-        self.InstallExtension(pyauto.FilePath(extension), False)
+        self.InstallExtension(extension, False)
 
       for url in top_urls:
         self.NavigateToURL(url)
 
       def _LogAndReturnCrashing():
         crashing_extensions = extensions[curr_extension:group_end]
         logging.debug('Crashing extensions: %s' % crashing_extensions)
         return crashing_extensions
 
       # If the browser has crashed, return the extensions in the failing group.
@@ skipping 72 matching lines @@
     self.assertTrue(len(permissions_api) == 3 and
                     'bookmarks' in permissions_api and
                     'experimental' in permissions_api and
                     'tabs' in permissions_api,
                     msg='Unexpected host permissions information.')
 
   def testSetExtensionStates(self):
     """Test setting different extension states."""
     crx_file_path = os.path.abspath(
         os.path.join(self.DataDir(), 'extensions', 'google_talk.crx'))
-    ext_id = self.InstallExtension(pyauto.FilePath(crx_file_path), False);
+    ext_id = self.InstallExtension(crx_file_path, False);
     self.assertTrue(ext_id, 'Failed to install extension.')
 
     # Verify extension is in default state.
     extension = self._GetExtensionInfoById(self.GetExtensionsInfo(), ext_id)
     self.assertTrue(extension['is_enabled'])
     self.assertFalse(extension['allowed_in_incognito'])
 
     # Disable the extension and verify.
     self.SetExtensionStateById(ext_id, enable=False, allow_in_incognito=False)
     extension = self._GetExtensionInfoById(self.GetExtensionsInfo(), ext_id)
@@ skipping 10 matching lines @@
     self.assertTrue(extension['allowed_in_incognito'])
 
     # Disallow extension in incognito mode and verify.
     self.SetExtensionStateById(ext_id, enable=True, allow_in_incognito=False)
     extension = self._GetExtensionInfoById(self.GetExtensionsInfo(), ext_id)
     self.assertFalse(extension['allowed_in_incognito'])
 
 
 if __name__ == '__main__':
   pyauto_functional.Main()