Add an installType property to the management API

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 c6eb36cf129990ac122e9eb4ea41f0b3ee5f6c0e..37094d0da3f54eaf554c8fea4cf52ed39c4eb22b 100644
--- a/chrome/browser/extensions/extension_browsertest.h
+++ b/chrome/browser/extensions/extension_browsertest.h
@@ -12,16 +12,13 @@
 #include "base/file_path.h"
 #include "base/scoped_temp_dir.h"
 #include "chrome/browser/extensions/extension_host.h"
+#include "chrome/common/extensions/extension.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/web_contents.h"
 
-namespace extensions {
-class Extension;
-}
-
 // Base class for extension browser tests. Provides utilities for loading,
 // unloading, and installing extensions.
 class ExtensionBrowserTest : virtual public InProcessBrowserTest,
@@ -38,9 +35,10 @@ class ExtensionBrowserTest : virtual public InProcessBrowserTest,
   // Same as above, but enables the extension in incognito mode first.
   const extensions::Extension* LoadExtensionIncognito(const FilePath& path);
 
-  const extensions::Extension* LoadExtensionWithOptions(const FilePath& path,
-                                            bool incognito_enabled,
-                                            bool fileaccess_enabled);
+  const extensions::Extension* LoadExtensionWithOptions(
+      const FilePath& path,
+      bool incognito_enabled,
+      bool fileaccess_enabled);
 
   // Loads extension and imitates that it is a component extension.
   const extensions::Extension* LoadExtensionAsComponent(const FilePath& path);
@@ -68,6 +66,16 @@ class ExtensionBrowserTest : virtual public InProcessBrowserTest,
                                     expected_change);
   }
 
+  // Same as above, but an install source other than Extension::INTERNAL can be
+  // specified. Intended to be used only in tests.

[asargent_no_longer_on_chrome, 2012/08/02 21:28:07]

nit: You probably don't need to mention that it's only to be used in tests,
since this whole class is only compiled into the browser_tests binary. =)

[mitchellwrosen, 2012/08/02 21:31:04]

Sure thing.

+  const extensions::Extension* InstallExtension(
+      const FilePath& path,
+      int expected_change,
+      extensions::Extension::Location install_source) {
+    return InstallOrUpdateExtension("", path, INSTALL_UI_TYPE_NONE,
+                                    expected_change, install_source);
+  }
+
   // Installs extension as if it came from the Chrome Webstore.
   const extensions::Extension* InstallExtensionFromWebstore(
       const FilePath& path, int expected_change);
@@ -76,7 +84,7 @@ class ExtensionBrowserTest : virtual public InProcessBrowserTest,
   // privilege increase.
   const extensions::Extension* UpdateExtension(const std::string& id,
                                                const FilePath& path,
-                                   int expected_change) {
+                                               int expected_change) {
     return InstallOrUpdateExtension(id, path, INSTALL_UI_TYPE_NONE,
                                     expected_change);
   }
@@ -196,6 +204,20 @@ class ExtensionBrowserTest : virtual public InProcessBrowserTest,
                                                         int expected_change,
                                                         Browser* browser,
                                                         bool from_webstore);
+  const extensions::Extension* InstallOrUpdateExtension(
+      const std::string& id,
+      const FilePath& path,
+      InstallUIType ui_type,
+      int expected_change,
+      extensions::Extension::Location install_source);
+  const extensions::Extension* InstallOrUpdateExtension(
+      const std::string& id,
+      const FilePath& path,
+      InstallUIType ui_type,
+      int expected_change,
+      extensions::Extension::Location install_source,
+      Browser* browser,
+      bool from_webstore);
 
   bool WaitForExtensionViewsToLoad();