summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions/extension_management_tests.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/extensions/extension_management_tests.cc')
-rw-r--r--chrome/browser/extensions/extension_management_tests.cc66
1 files changed, 29 insertions, 37 deletions
diff --git a/chrome/browser/extensions/extension_management_tests.cc b/chrome/browser/extensions/extension_management_tests.cc
index 5162ebe..014677a 100644
--- a/chrome/browser/extensions/extension_management_tests.cc
+++ b/chrome/browser/extensions/extension_management_tests.cc
@@ -49,7 +49,8 @@ class ExtensionManagementTest : public ExtensionBrowserTest {
// the operation was completed successfully.
bool InstallAndUpdateIncreasingPermissionsExtension() {
ExtensionsService* service = browser()->profile()->GetExtensionsService();
- size_t size_before = service->extensions()->size();
+ if (service->HasInstalledExtensions())
+ return false;
// Install the initial version, which should happen just fine.
if (!InstallExtension(
@@ -58,13 +59,13 @@ class ExtensionManagementTest : public ExtensionBrowserTest {
// Upgrade to a version that wants more permissions. We should disable the
// extension and prompt the user to reenable.
- if (service->extensions()->size() != size_before + 1)
+ if (service->extensions()->size() != 1u)
return false;
if (!UpdateExtension(
- service->extensions()->at(size_before)->id(),
+ service->extensions()->at(0)->id(),
test_data_dir_.AppendASCII("permissions-high-v2.crx"), -1))
return false;
- EXPECT_EQ(size_before, service->extensions()->size());
+ EXPECT_EQ(0u, service->extensions()->size());
if (service->disabled_extensions()->size() != 1u)
return false;
return true;
@@ -74,7 +75,7 @@ class ExtensionManagementTest : public ExtensionBrowserTest {
// Tests that installing the same version does not overwrite.
IN_PROC_BROWSER_TEST_F(ExtensionManagementTest, InstallSameVersion) {
ExtensionsService* service = browser()->profile()->GetExtensionsService();
- const size_t size_before = service->extensions()->size();
+ ASSERT_FALSE(service->HasInstalledExtensions());
ASSERT_TRUE(InstallExtension(
test_data_dir_.AppendASCII("install/install.crx"), 1));
@@ -82,32 +83,28 @@ IN_PROC_BROWSER_TEST_F(ExtensionManagementTest, InstallSameVersion) {
// be kept.
ASSERT_TRUE(InstallExtension(
test_data_dir_.AppendASCII("install/install_same_version.crx"), 0));
-
- EXPECT_TRUE(IsExtensionAtVersion(service->extensions()->at(size_before),
- "1.0"));
+ EXPECT_TRUE(IsExtensionAtVersion(service->extensions()->at(0), "1.0"));
}
IN_PROC_BROWSER_TEST_F(ExtensionManagementTest, InstallOlderVersion) {
ExtensionsService* service = browser()->profile()->GetExtensionsService();
- const size_t size_before = service->extensions()->size();
+ ASSERT_FALSE(service->HasInstalledExtensions());
ASSERT_TRUE(InstallExtension(
test_data_dir_.AppendASCII("install/install.crx"), 1));
ASSERT_TRUE(InstallExtension(
test_data_dir_.AppendASCII("install/install_older_version.crx"), 0));
- EXPECT_TRUE(IsExtensionAtVersion(service->extensions()->at(size_before),
- "1.0"));
+ EXPECT_TRUE(IsExtensionAtVersion(service->extensions()->at(0), "1.0"));
}
IN_PROC_BROWSER_TEST_F(ExtensionManagementTest, InstallThenCancel) {
ExtensionsService* service = browser()->profile()->GetExtensionsService();
- const size_t size_before = service->extensions()->size();
+ ASSERT_FALSE(service->HasInstalledExtensions());
ASSERT_TRUE(InstallExtension(
test_data_dir_.AppendASCII("install/install.crx"), 1));
// Cancel this install.
StartInstallButCancel(test_data_dir_.AppendASCII("install/install_v2.crx"));
- EXPECT_TRUE(IsExtensionAtVersion(service->extensions()->at(size_before),
- "1.0"));
+ EXPECT_TRUE(IsExtensionAtVersion(service->extensions()->at(0), "1.0"));
}
// Tests that installing and uninstalling extensions don't crash with an
@@ -133,11 +130,10 @@ IN_PROC_BROWSER_TEST_F(ExtensionManagementTest, Incognito) {
IN_PROC_BROWSER_TEST_F(ExtensionManagementTest, UpdatePermissions) {
ExtensionsService* service = browser()->profile()->GetExtensionsService();
ASSERT_TRUE(InstallAndUpdateIncreasingPermissionsExtension());
- const size_t size_before = service->extensions()->size();
// Now try reenabling it.
service->EnableExtension(service->disabled_extensions()->at(0)->id());
- EXPECT_EQ(size_before + 1, service->extensions()->size());
+ EXPECT_EQ(1u, service->extensions()->size());
EXPECT_EQ(0u, service->disabled_extensions()->size());
}
@@ -145,12 +141,12 @@ IN_PROC_BROWSER_TEST_F(ExtensionManagementTest, UpdatePermissions) {
IN_PROC_BROWSER_TEST_F(ExtensionManagementTest, UninstallDisabled) {
ExtensionsService* service = browser()->profile()->GetExtensionsService();
ASSERT_TRUE(InstallAndUpdateIncreasingPermissionsExtension());
- const size_t size_before = service->extensions()->size();
// Now try uninstalling it.
UninstallExtension(service->disabled_extensions()->at(0)->id());
- EXPECT_EQ(size_before, service->extensions()->size());
+ EXPECT_EQ(0u, service->extensions()->size());
EXPECT_EQ(0u, service->disabled_extensions()->size());
+ ASSERT_FALSE(service->HasInstalledExtensions());
}
// Tests that disabling and re-enabling an extension works.
@@ -158,29 +154,29 @@ IN_PROC_BROWSER_TEST_F(ExtensionManagementTest, DisableEnable) {
ExtensionProcessManager* manager = browser()->profile()->
GetExtensionProcessManager();
ExtensionsService* service = browser()->profile()->GetExtensionsService();
- const size_t size_before = service->extensions()->size();
// Load an extension, expect the background page to be available.
+ ASSERT_FALSE(service->HasInstalledExtensions());
ASSERT_TRUE(LoadExtension(
test_data_dir_.AppendASCII("good").AppendASCII("Extensions")
.AppendASCII("bjafgdebaacbbbecmhlhpofkepfkgcpa")
.AppendASCII("1.0")));
- ASSERT_EQ(size_before + 1, service->extensions()->size());
+ ASSERT_EQ(1u, service->extensions()->size());
EXPECT_EQ(0u, service->disabled_extensions()->size());
- Extension* extension = service->extensions()->at(size_before);
+ Extension* extension = service->extensions()->at(0);
EXPECT_TRUE(manager->GetBackgroundHostForExtension(extension));
ASSERT_TRUE(service->HasInstalledExtensions());
// After disabling, the background page should go away.
service->DisableExtension("bjafgdebaacbbbecmhlhpofkepfkgcpa");
- EXPECT_EQ(size_before, service->extensions()->size());
+ EXPECT_EQ(0u, service->extensions()->size());
EXPECT_EQ(1u, service->disabled_extensions()->size());
EXPECT_FALSE(manager->GetBackgroundHostForExtension(extension));
ASSERT_TRUE(service->HasInstalledExtensions());
// And bring it back.
service->EnableExtension("bjafgdebaacbbbecmhlhpofkepfkgcpa");
- EXPECT_EQ(size_before + 1, service->extensions()->size());
+ EXPECT_EQ(1u, service->extensions()->size());
EXPECT_EQ(0u, service->disabled_extensions()->size());
EXPECT_TRUE(manager->GetBackgroundHostForExtension(extension));
ASSERT_TRUE(service->HasInstalledExtensions());
@@ -203,15 +199,13 @@ IN_PROC_BROWSER_TEST_F(ExtensionManagementTest, AutoUpdate) {
// Install version 1 of the extension.
ExtensionsService* service = browser()->profile()->GetExtensionsService();
- const size_t size_before = service->extensions()->size();
- ASSERT_TRUE(service->disabled_extensions()->empty());
+ ASSERT_FALSE(service->HasInstalledExtensions());
ASSERT_TRUE(InstallExtension(basedir.AppendASCII("v1.crx"), 1));
const ExtensionList* extensions = service->extensions();
- ASSERT_EQ(size_before + 1, extensions->size());
ASSERT_TRUE(service->HasInstalledExtensions());
- ASSERT_EQ("ogjcoiohnmldgjemafoockdghcjciccf",
- extensions->at(size_before)->id());
- ASSERT_EQ("1.0", extensions->at(size_before)->VersionString());
+ ASSERT_EQ(1u, extensions->size());
+ ASSERT_EQ("ogjcoiohnmldgjemafoockdghcjciccf", extensions->at(0)->id());
+ ASSERT_EQ("1.0", extensions->at(0)->VersionString());
// We don't want autoupdate blacklist checks.
service->updater()->set_blacklist_checks_enabled(false);
@@ -220,10 +214,9 @@ IN_PROC_BROWSER_TEST_F(ExtensionManagementTest, AutoUpdate) {
service->updater()->CheckNow();
ASSERT_TRUE(WaitForExtensionInstall());
extensions = service->extensions();
- ASSERT_EQ(size_before + 1, extensions->size());
- ASSERT_EQ("ogjcoiohnmldgjemafoockdghcjciccf",
- extensions->at(size_before)->id());
- ASSERT_EQ("2.0", extensions->at(size_before)->VersionString());
+ ASSERT_EQ(1u, extensions->size());
+ ASSERT_EQ("ogjcoiohnmldgjemafoockdghcjciccf", extensions->at(0)->id());
+ ASSERT_EQ("2.0", extensions->at(0)->VersionString());
// Now try doing an update to version 3, which has been incorrectly
// signed. This should fail.
@@ -237,9 +230,8 @@ IN_PROC_BROWSER_TEST_F(ExtensionManagementTest, AutoUpdate) {
// Make sure the extension state is the same as before.
extensions = service->extensions();
- ASSERT_EQ(size_before + 1, extensions->size());
- ASSERT_EQ("ogjcoiohnmldgjemafoockdghcjciccf",
- extensions->at(size_before)->id());
- ASSERT_EQ("2.0", extensions->at(size_before)->VersionString());
+ ASSERT_EQ(1u, extensions->size());
+ ASSERT_EQ("ogjcoiohnmldgjemafoockdghcjciccf", extensions->at(0)->id());
+ ASSERT_EQ("2.0", extensions->at(0)->VersionString());
}
#endif // !defined(OS_LINUX)
generated by cgit v1.1 at 2025-03-04 00:45:35 +0000