Tests for incognito app install, plus some cleanup.

chrome/browser/extensions/extension_browsertest.h

Index: chrome/browser/extensions/extension_browsertest.h
diff --git a/chrome/browser/extensions/extension_browsertest.h b/chrome/browser/extensions/extension_browsertest.h
index 9b7f5f00efdee22ff6e6cd10bbc62e295770ca26..ef97aa5e6e18085576dfb1a1e58cab70b324d97e 100644
--- a/chrome/browser/extensions/extension_browsertest.h
+++ b/chrome/browser/extensions/extension_browsertest.h
@@ -29,6 +29,10 @@ class ExtensionBrowserTest
   // Same as above, but enables the extension in incognito mode first.
   bool LoadExtensionIncognito(const FilePath& path);
 
+  // Pack the extension in |dir_path| into a crx file and return the path
+  // to that file via |crx_path| pointer.
+  void PackExtension(const FilePath& dir_path, FilePath* crx_path);

[Aaron Boodman, 2010/12/15 22:29:18]

This is fine, but you could also return the FilePath for a slightly easier to
use API. An empty/invalid FilePath would mean that packing failed.

[Tessa MacDuff, 2010/12/16 00:08:04]

Yes, that means I'll need to remove all the ASSERTs so it will be slightly
harder to debug if it fails.  But I agree, impler API seems a better tradeoff.

[Aaron Boodman, 2011/01/14 20:58:43]

What asserts do you mean here?

[Tessa MacDuff, 2011/01/20 22:20:24]

There are a bunch of ASSERT_TRUEs in the body of this function.

They are only allowed by the compiler if the function has no/void return type. 
I changed them to if...ADD_FAILURE()...return FilePath() as discussed.

+
   // |expected_change| indicates how many extensions should be installed (or
   // disabled, if negative).
   // 1 means you expect a new install, 0 means you expect an upgrade, -1 means
@@ -52,6 +56,12 @@ class ExtensionBrowserTest
     return InstallOrUpdateExtension("", path, INSTALL_UI_TYPE_NORMAL,
                                     expected_change);
   }
+  bool InstallExtensionWithUIAutoConfirm(const FilePath& path,
+                                         int expected_change,
+                                         Profile* profile) {
+    return InstallOrUpdateExtension("", path, INSTALL_UI_TYPE_AUTO_CONFIRM,
+                                    expected_change, profile);
+  }
 
   // Begins install process but simulates a user cancel.
   bool StartInstallButCancel(const FilePath& path) {
@@ -109,11 +119,16 @@ class ExtensionBrowserTest
     INSTALL_UI_TYPE_NONE,
     INSTALL_UI_TYPE_CANCEL,
     INSTALL_UI_TYPE_NORMAL,
+    INSTALL_UI_TYPE_AUTO_CONFIRM,
   };
 
   bool InstallOrUpdateExtension(const std::string& id, const FilePath& path,
                                 InstallUIType ui_type,
                                 int expected_change);
+  bool InstallOrUpdateExtension(const std::string& id, const FilePath& path,
+                                InstallUIType ui_type,
+                                int expected_change,
+                                Profile* profile);
   bool LoadExtensionImpl(const FilePath& path, bool incognito_enabled);
 
   bool WaitForExtensionHostsToLoad();