Fix for hook UninstallExtensionById, and PyAuto function to uninstall an app.

Revised the UninstallExtensionById automation hook to properly wait for
the EXTENSION_UNINSTALLED notification before sending a reply.  Also
implemented a PyAuto function "UninstallApp", one of the functions needed
to automate the context menu for an app on Chrome's new tab page.

BUG=75205
TEST=none

Review URL: http://codereview.chromium.org/6679015

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@79697 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 52 insertions, 21 deletions

diff --git a/chrome/test/functional/ntp.py b/chrome/test/functional/ntp.py
index 1ea8abe..e014613 100644
--- a/chrome/test/functional/ntp.py
+++ b/chrome/test/functional/ntp.py
@@ -1,5 +1,5 @@
 #!/usr/bin/python
-# Copyright (c) 2010 The Chromium Authors. All rights reserved.
+# 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.
 
@@ -13,6 +13,12 @@ import test_utils
 class NTPTest(pyauto.PyUITest):
   """Test of the NTP."""
 
+  _EXPECTED_DEFAULT_APPS = [
+    {
+      u'name': u'Chrome Web Store'
+    }
+  ]
+
   def Debug(self):
     """Test method for experimentation.
 
@@ -335,12 +341,7 @@ class NTPTest(pyauto.PyUITest):
   def testGetAppsInNewProfile(self):
     """Ensures that the only app in a new profile is the Web Store app."""
     app_info = self.GetNTPApps()
-    expected_app_info = [
-      {
-        u'name': u'Chrome Web Store'
-      }
-    ]
-    self._VerifyAppInfo(app_info, expected_app_info)
+    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."""
@@ -351,12 +352,10 @@ class NTPTest(pyauto.PyUITest):
     app_info = self.GetNTPApps()
     expected_app_info = [
       {
-        u'name': u'Chrome Web Store'
-      },
-      {
         u'name': u'Countdown'
       }
     ]
+    expected_app_info.extend(self._EXPECTED_DEFAULT_APPS)
     self._VerifyAppInfo(app_info, expected_app_info)
 
   def testGetAppsWhenInstallNonApps(self):
@@ -373,13 +372,30 @@ class NTPTest(pyauto.PyUITest):
     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.
+    app_crx_file = pyauto.FilePath(
+        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.')
+    app_info = self.GetNTPApps()
     expected_app_info = [
       {
-        u'name': u'Chrome Web Store'
+        u'name': 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.UninstallApp(installed_app_id)
+    app_info = self.GetNTPApps()
+    self._VerifyAppInfo(app_info, self._EXPECTED_DEFAULT_APPS)
+
   def _VerifyThumbnailOrMenuMode(self, actual_info, expected_info):
     """Verifies that the expected thumbnail/menu info matches the actual info.
 
diff --git a/chrome/test/pyautolib/pyauto.py b/chrome/test/pyautolib/pyauto.py
index edb4243..89de09a 100644
--- a/chrome/test/pyautolib/pyauto.py
+++ b/chrome/test/pyautolib/pyauto.py
@@ -1603,7 +1603,7 @@ class PyUITest(pyautolib.PyUITestBase, unittest.TestCase):
     Uses InstallExtension().
 
     Returns:
-      True, on success.
+      The ID of the installed theme, on success.  The empty string, otherwise.
     """
     return self.InstallExtension(crx_file_path, True)
 
@@ -2144,10 +2144,19 @@ class PyUITest(pyautolib.PyUITestBase, unittest.TestCase):
     return until the app is installed.
 
     Returns:
-      True, on success.
+      The ID of the installed app, on success.  The empty string, otherwise.
     """
     return self.InstallExtension(app_crx_file_path, False)
 
+  def UninstallApp(self, app_id):
+    """Uninstalls the specified app synchronously.
+
+    Args:
+      app_id: The string ID of the app to uninstall.  It can be retrieved
+              through the call to GetNTPApps above.
+    """
+    return self.UninstallExtensionById(app_id)
+
   def KillRendererProcess(self, pid):
     """Kills the given renderer process.
 
diff --git a/chrome/test/pyautolib/pyautolib.cc b/chrome/test/pyautolib/pyautolib.cc
index 7af1db8..667c597 100644
--- a/chrome/test/pyautolib/pyautolib.cc
+++ b/chrome/test/pyautolib/pyautolib.cc
@@ -201,10 +201,14 @@ int PyUITestBase::GetBrowserWindowCount() {
   return num_windows;
 }
 
-bool PyUITestBase::InstallExtension(const FilePath& crx_file, bool with_ui) {
+std::string PyUITestBase::InstallExtension(const FilePath& crx_file,
+                                           bool with_ui) {
   scoped_refptr<ExtensionProxy> proxy =
       automation()->InstallExtension(crx_file, with_ui);
-  return proxy.get() != NULL;
+  std::string id;
+  if (!proxy.get() || !proxy.get()->GetId(&id))
+    return "";
+  return id;
 }
 
 bool PyUITestBase::GetBookmarkBarVisibility() {
diff --git a/chrome/test/pyautolib/pyautolib.h b/chrome/test/pyautolib/pyautolib.h
index da52d79..5e5c22d 100644
--- a/chrome/test/pyautolib/pyautolib.h
+++ b/chrome/test/pyautolib/pyautolib.h
@@ -121,9 +121,10 @@ class PyUITestBase : public UITestBase {
   // Fetch the number of browser windows. Includes popups.
   int GetBrowserWindowCount();
 
-  // Installs the extension crx. Returns true only if extension was installed
-  // and loaded successfully. Overinstalls will fail.
-  bool InstallExtension(const FilePath& crx_file, bool with_ui);
+  // Installs the extension crx.  Returns the extension ID only if the extension
+  // was installed and loaded successfully.  Otherwise, returns the empty
+  // string.  Overinstalls will fail.
+  std::string InstallExtension(const FilePath& crx_file, bool with_ui);
 
   // Returns bookmark bar visibility state.
   bool GetBookmarkBarVisibility();
diff --git a/chrome/test/pyautolib/pyautolib.i b/chrome/test/pyautolib/pyautolib.i
index e9db1de..a35660d 100644
--- a/chrome/test/pyautolib/pyautolib.i
+++ b/chrome/test/pyautolib/pyautolib.i
@@ -359,9 +359,10 @@ class PyUITestBase {
   bool IsBrowserRunning();
 
   %feature("docstring", "Install an extension from the given file.  The file "
-           "must be specified with an absolute path. Returns True if "
-           "successfully installed and loaded.") InstallExtension;
-  bool InstallExtension(const FilePath& crx_file, bool with_ui);
+           "must be specified with an absolute path. Returns the extension ID "
+           "if successfully installed and loaded. Otherwise, returns the empty "
+           "string.") InstallExtension;
+  std::string InstallExtension(const FilePath& crx_file, bool with_ui);
 
   %feature("docstring", "Get a proxy to the browser window at the given "
                         "zero-based index.") GetBrowserWindow;