chrome/browser/background/background_application_list_model_unittest.cc - Issue 284103002: Replace "external_install" boolean parameter with explicit enumeration in ExtensionUninstall method.

Unified Diff: chrome/browser/background/background_application_list_model_unittest.cc

Issue 284103002: Replace "external_install" boolean parameter with explicit enumeration in ExtensionUninstall method. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Address issue exposed by failing unit test. Created 6 years, 5 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/apps/ephemeral_app_service.cc ('k') | chrome/browser/extensions/activity_log/activity_log_enabled_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/background/background_application_list_model_unittest.cc

diff --git a/chrome/browser/background/background_application_list_model_unittest.cc b/chrome/browser/background/background_application_list_model_unittest.cc

index 29ecc8c0da2f0a350bb0f2a6a5435d5b705d903b..a8c817942175bad9553120e77c7882b0c8544e9b 100644

--- a/chrome/browser/background/background_application_list_model_unittest.cc

+++ b/chrome/browser/background/background_application_list_model_unittest.cc

@@ -211,23 +211,28 @@ TEST_F(BackgroundApplicationListModelTest, MAYBE_ExplicitTest) {

// Remove in FIFO order.

ASSERT_FALSE(IsBackgroundApp(*ext1.get()));

- service->UninstallExtension(ext1->id(), false, NULL);

+ service->UninstallExtension(

+ ext1->id(), ExtensionService::UNINSTALL_REASON_FOR_TESTING, NULL);

ASSERT_EQ(4U, service->extensions()->size());

ASSERT_EQ(2U, model->size());

ASSERT_TRUE(IsBackgroundApp(*bgapp1.get()));

- service->UninstallExtension(bgapp1->id(), false, NULL);

+ service->UninstallExtension(

+ bgapp1->id(), ExtensionService::UNINSTALL_REASON_FOR_TESTING, NULL);

ASSERT_EQ(3U, service->extensions()->size());

ASSERT_EQ(1U, model->size());

ASSERT_FALSE(IsBackgroundApp(*ext2.get()));

- service->UninstallExtension(ext2->id(), false, NULL);

+ service->UninstallExtension(

+ ext2->id(), ExtensionService::UNINSTALL_REASON_FOR_TESTING, NULL);

ASSERT_EQ(2U, service->extensions()->size());

ASSERT_EQ(1U, model->size());

ASSERT_TRUE(IsBackgroundApp(*bgapp2.get()));

- service->UninstallExtension(bgapp2->id(), false, NULL);

+ service->UninstallExtension(

+ bgapp2->id(), ExtensionService::UNINSTALL_REASON_FOR_TESTING, NULL);

ASSERT_EQ(1U, service->extensions()->size());

ASSERT_EQ(0U, model->size());

ASSERT_FALSE(IsBackgroundApp(*ext3.get()));

- service->UninstallExtension(ext3->id(), false, NULL);

+ service->UninstallExtension(

+ ext3->id(), ExtensionService::UNINSTALL_REASON_FOR_TESTING, NULL);

ASSERT_EQ(0U, service->extensions()->size());

ASSERT_EQ(0U, model->size());

}

@@ -278,7 +283,8 @@ TEST_F(BackgroundApplicationListModelTest, PushMessagingTest) {

ASSERT_EQ(2U, model->size());

// Need to remove ext2 because it uses same id as bgapp3.

ASSERT_FALSE(IsBackgroundApp(*ext2.get()));

- service->UninstallExtension(ext2->id(), false, NULL);

+ service->UninstallExtension(

+ ext2->id(), ExtensionService::UNINSTALL_REASON_FOR_TESTING, NULL);

ASSERT_EQ(3U, service->extensions()->size());

ASSERT_EQ(2U, model->size());

ASSERT_TRUE(IsBackgroundApp(*bgapp3.get()));

@@ -288,19 +294,23 @@ TEST_F(BackgroundApplicationListModelTest, PushMessagingTest) {

// Remove in FIFO order.

ASSERT_FALSE(IsBackgroundApp(*ext1.get()));

- service->UninstallExtension(ext1->id(), false, NULL);

+ service->UninstallExtension(

+ ext1->id(), ExtensionService::UNINSTALL_REASON_FOR_TESTING, NULL);

ASSERT_EQ(3U, service->extensions()->size());

ASSERT_EQ(3U, model->size());

ASSERT_TRUE(IsBackgroundApp(*bgapp1.get()));

- service->UninstallExtension(bgapp1->id(), false, NULL);

+ service->UninstallExtension(

+ bgapp1->id(), ExtensionService::UNINSTALL_REASON_FOR_TESTING, NULL);

ASSERT_EQ(2U, service->extensions()->size());

ASSERT_EQ(2U, model->size());

ASSERT_TRUE(IsBackgroundApp(*bgapp2.get()));

- service->UninstallExtension(bgapp2->id(), false, NULL);

+ service->UninstallExtension(

+ bgapp2->id(), ExtensionService::UNINSTALL_REASON_FOR_TESTING, NULL);

ASSERT_EQ(1U, service->extensions()->size());

ASSERT_EQ(1U, model->size());

ASSERT_TRUE(IsBackgroundApp(*bgapp3.get()));

- service->UninstallExtension(bgapp3->id(), false, NULL);

+ service->UninstallExtension(

+ bgapp3->id(), ExtensionService::UNINSTALL_REASON_FOR_TESTING, NULL);

ASSERT_EQ(0U, service->extensions()->size());

ASSERT_EQ(0U, model->size());

}

@@ -417,7 +427,8 @@ void RemoveExtension(ExtensionService* service,

extensions->erase(cursor);

--*count;

ASSERT_EQ(*count, extensions->size());

- service->UninstallExtension(extension->id(), false, NULL);

+ service->UninstallExtension(

+ extension->id(), ExtensionService::UNINSTALL_REASON_FOR_TESTING, NULL);

ASSERT_EQ(*count, service->extensions()->size());

ASSERT_EQ(*expected, model->size());

}