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

chrome/test/functional/themes.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 glob
 import logging
 import os
 
 import pyauto_functional  # Must be imported before pyauto
@@ skipping 12 matching lines @@
     pp = pprint.PrettyPrinter(indent=2)
     while True:
       raw_input('Hit <enter> to dump info.. ')
       pp.pprint(self.GetThemeInfo())
 
   def testSetTheme(self):
     """Verify theme install."""
     self.assertFalse(self.GetThemeInfo())  # Verify there's no theme at startup
     crx_file = os.path.abspath(
         os.path.join(self.DataDir(), 'extensions', 'theme.crx'))
-    self.assertTrue(self.SetTheme(pyauto.FilePath(crx_file)))
+    self.assertTrue(self.SetTheme(crx_file))
     # Verify "theme installed" infobar shows up
     self.assertTrue(self.WaitForInfobarCount(1))
     theme = self.GetThemeInfo()
     self.assertEqual('camo theme', theme['name'])
     self.assertTrue(self.GetBrowserInfo()['windows'][0]['tabs'][0]['infobars'])
 
   def testThemeInFullScreen(self):
     """Verify theme can be installed in FullScreen mode."""
     self.ApplyAccelerator(pyauto.IDC_FULLSCREEN )
     self.assertFalse(self.GetThemeInfo())  # Verify there's no theme at startup
     crx_file = os.path.abspath(
         os.path.join(self.DataDir(), 'extensions', 'theme.crx'))
-    self.assertTrue(self.SetTheme(pyauto.FilePath(crx_file)))
+    self.assertTrue(self.SetTheme(crx_file))
     # Verify "theme installed" infobar shows up
     self.assertTrue(self.WaitForInfobarCount(1))
     theme = self.GetThemeInfo()
     self.assertEqual('camo theme', theme['name'])
 
   def testThemeReset(self):
     """Verify theme reset."""
     crx_file = os.path.abspath(
         os.path.join(self.DataDir(), 'extensions', 'theme.crx'))
-    self.assertTrue(self.SetTheme(pyauto.FilePath(crx_file)))
+    self.assertTrue(self.SetTheme(crx_file))
     self.assertTrue(self.ResetToDefaultTheme())
     self.assertFalse(self.GetThemeInfo())
 
   def _ReturnCrashingThemes(self, themes, group_size, urls):
     """Install the given themes in groups of group_size and return the
        group of themes that crashes (if any).
 
     Note: restarts the browser at the beginning of the function.
 
     Args:
       themes: A list of themes to install.
       group_size: The number of themes to install at one time.
       urls: The list of urls to visit.
     """
     self.RestartBrowser()
     curr_theme = 0
     num_themes = len(themes)
 
     while curr_theme < num_themes:
       logging.debug('New group of %d themes.' % group_size)
       group_end = curr_theme + group_size
       this_group = themes[curr_theme:group_end]
 
       # Apply each theme in this group.
       for theme in this_group:
         logging.debug('Applying theme: %s' % theme)
-        self.assertTrue(self.SetTheme(pyauto.FilePath(theme)),
+        self.assertTrue(self.SetTheme(theme),
                         'Theme %s not installed.' % theme)
 
       for url in urls:
         self.NavigateToURL(url)
 
       def _LogAndReturnCrashing():
         logging.debug('Crashing themes: %s' % this_group)
         return this_group
 
       # Assert that there is at least 1 browser window.
@@ skipping 37 matching lines @@
       failed_themes = self._ReturnCrashingThemes(failed_themes, group_size,
                                                  urls)
       group_size = group_size // 2
 
     self.assertFalse(failed_themes,
                      'Theme(s) in failing group: %s' % failed_themes)
 
 
 if __name__ == '__main__':
   pyauto_functional.Main()
-