| Index: chrome/browser/extensions/extension_service_test_with_install.h
|
| diff --git a/chrome/browser/extensions/extension_service_test_with_install.h b/chrome/browser/extensions/extension_service_test_with_install.h
|
| index 0be2d9abe22a678f3dd1658ea8e98dd3fcf3539b..92bd6ccf185b5746d30e324672f607786a8f9e7b 100644
|
| --- a/chrome/browser/extensions/extension_service_test_with_install.h
|
| +++ b/chrome/browser/extensions/extension_service_test_with_install.h
|
| @@ -52,27 +52,31 @@ class ExtensionServiceTestWithInstall : public ExtensionServiceTestBase,
|
| const Extension* PackAndInstallCRX(const base::FilePath& dir_path,
|
| const base::FilePath& pem_path,
|
| InstallState install_state,
|
| - int creation_flags);
|
| + int creation_flags,
|
| + Manifest::Location install_location);
|
| const Extension* PackAndInstallCRX(const base::FilePath& dir_path,
|
| const base::FilePath& pem_path,
|
| InstallState install_state);
|
| const Extension* PackAndInstallCRX(const base::FilePath& dir_path,
|
| InstallState install_state);
|
| -
|
| + const Extension* PackAndInstallCRX(const base::FilePath& dir_path,
|
| + Manifest::Location install_location,
|
| + InstallState install_state);
|
| const Extension* InstallCRX(const base::FilePath& path,
|
| InstallState install_state,
|
| int creation_flags,
|
| const std::string& expected_old_name);
|
| const Extension* InstallCRX(const base::FilePath& path,
|
| + Manifest::Location install_location,
|
| + InstallState install_state,
|
| + int creation_flags);
|
| + const Extension* InstallCRX(const base::FilePath& path,
|
| InstallState install_state,
|
| int creation_flags);
|
| const Extension* InstallCRX(const base::FilePath& path,
|
| InstallState install_state);
|
| const Extension* InstallCRXFromWebStore(const base::FilePath& path,
|
| InstallState install_state);
|
| - const Extension* InstallCRXWithLocation(const base::FilePath& crx_path,
|
| - Manifest::Location install_location,
|
| - InstallState install_state);
|
|
|
| // Verifies the result of a CRX installation. Used by InstallCRX. Set the
|
| // |install_state| to INSTALL_FAILED if the installation is expected to fail.
|
| @@ -135,7 +139,10 @@ class ExtensionServiceTestWithInstall : public ExtensionServiceTestBase,
|
| UnloadedExtensionInfo::Reason unloaded_reason_;
|
|
|
| private:
|
| - void InstallCRXInternal(const base::FilePath& crx_path, int creation_flags);
|
| + void InstallCRXInternal(const base::FilePath& crx_path,
|
| + Manifest::Location install_location,
|
| + InstallState install_state,
|
| + int creation_flags);
|
|
|
| size_t expected_extensions_count_;
|
|
|
|
|