Add an installType property to the management API

chrome/browser/extensions/extension_browsertest.h

 // Copyright (c) 2012 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.
 
 #ifndef CHROME_BROWSER_EXTENSIONS_EXTENSION_BROWSERTEST_H_
 #define CHROME_BROWSER_EXTENSIONS_EXTENSION_BROWSERTEST_H_
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #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,
                              public content::NotificationObserver {
  protected:
   ExtensionBrowserTest();
   virtual ~ExtensionBrowserTest();
 
   // InProcessBrowserTest
   virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE;
 
   const extensions::Extension* LoadExtension(const FilePath& path);
 
   // 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);
 
   // Pack the extension in |dir_path| into a crx file and return its path.
   // Return an empty FilePath if there were errors.
   FilePath PackExtension(const FilePath& dir_path);
 
   // Pack the extension in |dir_path| into a crx file at |crx_path|, using the
   // key |pem_path|. If |pem_path| does not exist, create a new key at
   // |pem_out_path|.
   // Return the path to the crx file, or an empty FilePath if there were errors.
   FilePath PackExtensionWithOptions(const FilePath& dir_path,
                                     const FilePath& crx_path,
                                     const FilePath& pem_path,
                                     const FilePath& pem_out_path);
 
   // |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
   // you expect a failed upgrade.
   const extensions::Extension* InstallExtension(const FilePath& path,
                                                 int expected_change) {
     return InstallOrUpdateExtension("", path, INSTALL_UI_TYPE_NONE,
                                     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);
 
   // Same as above but passes an id to CrxInstaller and does not allow a
   // 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);
   }
 
   // Same as |InstallExtension| but with the normal extension UI showing up
   // (for e.g. info bar on success).
   const extensions::Extension* InstallExtensionWithUI(const FilePath& path,
                                                       int expected_change) {
     return InstallOrUpdateExtension("", path, INSTALL_UI_TYPE_NORMAL,
                                     expected_change);
@@ skipping 99 matching lines @@
   const extensions::Extension* InstallOrUpdateExtension(const std::string& id,
                                                         const FilePath& path,
                                                         InstallUIType ui_type,
                                                         int expected_change);
   const extensions::Extension* InstallOrUpdateExtension(const std::string& id,
                                                         const FilePath& path,
                                                         InstallUIType ui_type,
                                                         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();
 
   // When waiting for page action count to change, we wait until it reaches this
   // value.
   int target_page_action_count_;
 
   // When waiting for visible page action count to change, we wait until it
   // reaches this value.
   int target_visible_page_action_count_;
 };
 
 #endif  // CHROME_BROWSER_EXTENSIONS_EXTENSION_BROWSERTEST_H_