Allow chromedriver to install an extension and get all installed extension IDs.

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 copy
 import os
 
 import pyauto_functional  # Must be imported before pyauto
 import pyauto
@@ skipping 361 matching lines @@
                                        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 = 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
+    return self.InstallExtension(app_crx_file)
 
   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'title': 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 = os.path.abspath(os.path.join(self.DataDir(), 'extensions',
                                                 'page_action.crx'))
-    self.assertTrue(self.InstallExtension(ext_crx_file, False),
-                    msg='Extension install failed.')
+    self.InstallExtension(ext_crx_file)
     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.')
+    self.SetTheme(theme_crx_file)
     # 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()
     expected_app_info = [
       {
         u'title': u'Countdown'
       }
     ]
     expected_app_info.extend(self._EXPECTED_DEFAULT_APPS)
     self._VerifyAppInfo(app_info, expected_app_info)
 
     # Next, uninstall the app and verify that it is removed from the NTP.
-    self.assertTrue(self.UninstallApp(installed_app_id),
-                    msg='Call to UninstallApp() returned False.')
+    self.assertTrue(self.UninstallExtensionById(installed_app_id),
+                    msg='Call to UninstallExtensionById() returned False.')
     app_info = self.GetNTPApps()
     self._VerifyAppInfo(app_info, self._EXPECTED_DEFAULT_APPS)
 
   def testCannotUninstallWebStore(self):
     """Ensures that the WebStore app cannot be uninstalled."""
     # Verify that the WebStore app is already installed in a fresh profile.
     app_info = self.GetNTPApps()
     self._VerifyAppInfo(app_info, self._EXPECTED_DEFAULT_APPS)
     self.assertTrue(app_info and 'id' in app_info[0],
                     msg='Cannot identify ID of WebStore app.')
     webstore_id = app_info[0]['id']
 
     # Attempt to uninstall the WebStore app and verify that it still exists
     # in the App info of the NTP even after we try to uninstall it.
-    self.assertFalse(self.UninstallApp(webstore_id),
-                     msg='Call to UninstallApp() returned True.')
+    self.assertFalse(self.UninstallExtensionById(webstore_id),
+                     msg='Call to UninstallExtensionById() returned True.')
     self._VerifyAppInfo(self.GetNTPApps(), self._EXPECTED_DEFAULT_APPS)
 
   def testLaunchAppWithDefaultSettings(self):
     """Verifies that an app can be launched with the default settings."""
     # Install an app.
     installed_app_id = self._InstallAndVerifySamplePackagedApp()
 
     # Launch the app from the NTP.
     self.LaunchApp(installed_app_id)
 
@@ skipping 65 matching lines @@
     info = self.GetBrowserInfo()
     self.assertTrue(len(info['windows']) == 2,
                     msg='A second window does not exist.')
     actual_tab_url = info['windows'][1]['tabs'][0]['url']
     expected_app_url_start = 'chrome-extension://' + installed_app_id
     self.assertTrue(actual_tab_url.startswith(expected_app_url_start),
                     msg='The app was not launched in the new window.')
 
 if __name__ == '__main__':
   pyauto_functional.Main()