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

chrome/test/functional/ntp.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 pyauto_functional  # Must be imported before pyauto
 import pyauto
 import test_utils
@@ skipping 352 matching lines @@
                         msg='For attribute "%s", expected value "%s", but got '
                             '"%s".' % (attribute, expected_app[attribute],
                                        actual_info[i][attribute]))
 
   def _InstallAndVerifySamplePackagedApp(self):
     """Installs a sample packaged app and verifies the install is successful.
 
     Returns:
       The string ID of the installed app.
     """
-    app_crx_file = pyauto.FilePath(
-        os.path.abspath(os.path.join(self.DataDir(), 'pyauto_private', 'apps',
-                                     'countdown.crx')))
+    app_crx_file = os.path.abspath(os.path.join(
+        self.DataDir(), 'pyauto_private', 'apps', 'countdown.crx'))
     installed_app_id = self.InstallApp(app_crx_file)
     self.assertTrue(installed_app_id, msg='App install failed.')
     return installed_app_id
 
   def testGetAppsInNewProfile(self):
     """Ensures that the only app in a new profile is the Web Store app."""
     app_info = self.GetNTPApps()
     self._VerifyAppInfo(app_info, self._EXPECTED_DEFAULT_APPS)
 
   def testGetAppsWhenInstallApp(self):
     """Ensures that an installed app is reflected in the app info in the NTP."""
     self._InstallAndVerifySamplePackagedApp()
     app_info = self.GetNTPApps()
     expected_app_info = [
       {
         u'name': u'Countdown'
       }
     ]
     expected_app_info.extend(self._EXPECTED_DEFAULT_APPS)
     self._VerifyAppInfo(app_info, expected_app_info)
 
   def testGetAppsWhenInstallNonApps(self):
     """Ensures installed non-apps are not reflected in the NTP app info."""
     # Install a regular extension and a theme.
-    ext_crx_file = pyauto.FilePath(
-        os.path.abspath(os.path.join(self.DataDir(), 'extensions',
-                                     'page_action.crx')))
+    ext_crx_file = os.path.abspath(os.path.join(self.DataDir(), 'extensions',
+                                                'page_action.crx'))
     self.assertTrue(self.InstallExtension(ext_crx_file, False),
                     msg='Extension install failed.')
-    theme_crx_file = pyauto.FilePath(
-        os.path.abspath(os.path.join(self.DataDir(), 'extensions',
-                                     'theme.crx')))
+    theme_crx_file = os.path.abspath(os.path.join(self.DataDir(), 'extensions',
+                                                  'theme.crx'))
     self.assertTrue(self.SetTheme(theme_crx_file), msg='Theme install failed.')
     # Verify that no apps are listed on the NTP except for the Web Store.
     app_info = self.GetNTPApps()
     self._VerifyAppInfo(app_info, self._EXPECTED_DEFAULT_APPS)
 
   def testUninstallApp(self):
     """Ensures that an uninstalled app is reflected in the NTP app info."""
     # First, install an app and verify that it exists in the NTP app info.
     installed_app_id = self._InstallAndVerifySamplePackagedApp()
     app_info = self.GetNTPApps()
@@ skipping 300 matching lines @@
     thumb_info = self.GetNTPThumbnailMode()
     expected_thumb_info = {
       u'apps': False,
       u'most_visited': True
     }
     self._VerifyThumbnailOrMenuMode(thumb_info, expected_thumb_info)
 
 
 if __name__ == '__main__':
   pyauto_functional.Main()