| Index: chrome/test/functional/ntp.py
|
| diff --git a/chrome/test/functional/ntp.py b/chrome/test/functional/ntp.py
|
| index 3086ee6df285fcb985784fa582f0bd0c09cb7622..360130d9fc9b88ef11a6e77379d7a4af5c40c9ff 100644
|
| --- a/chrome/test/functional/ntp.py
|
| +++ b/chrome/test/functional/ntp.py
|
| @@ -379,9 +379,7 @@ class NTPTest(pyauto.PyUITest):
|
| """
|
| 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."""
|
| @@ -405,11 +403,10 @@ class NTPTest(pyauto.PyUITest):
|
| # 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)
|
| @@ -428,8 +425,8 @@ class NTPTest(pyauto.PyUITest):
|
| 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)
|
|
|
| @@ -444,8 +441,8 @@ class NTPTest(pyauto.PyUITest):
|
|
|
| # 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):
|
|
|