Tests for incognito app install, plus some cleanup.

chrome/browser/extensions/extension_browsertest.h

 // Copyright (c) 2010 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_
 #pragma once
 
 #include <string>
 
@@ skipping 11 matching lines @@
     : public InProcessBrowserTest, public NotificationObserver {
  protected:
   ExtensionBrowserTest();
 
   virtual void SetUpCommandLine(CommandLine* command_line);
   bool LoadExtension(const FilePath& path);
 
   // 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 its path.
+  // Return an empty FilePath if there were errors.
+  FilePath PackExtension(const FilePath& dir_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.
   bool InstallExtension(const FilePath& path, int expected_change) {
     return InstallOrUpdateExtension("", path, INSTALL_UI_TYPE_NONE,
                                     expected_change);
   }
 
   // Same as above but passes an id to CrxInstaller and does not allow a
   // privilege increase.
   bool UpdateExtension(const std::string& id, const FilePath& path,
                        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).
   bool InstallExtensionWithUI(const FilePath& path, int expected_change) {
     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) {
     return InstallOrUpdateExtension("", path, INSTALL_UI_TYPE_CANCEL, 0);
   }
 
   void ReloadExtension(const std::string& extension_id);
 
   void UnloadExtension(const std::string& extension_id);
 
@@ skipping 37 matching lines @@
   std::string last_loaded_extension_id_;
   int extension_installs_observed_;
 
  private:
   // Specifies the type of UI (if any) to show during installation and what
   // user action to simulate.
   enum InstallUIType {
     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();
 
   // 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_