trunk/src/chrome/browser/background/background_application_list_model_unittest.cc - Issue 369863002: Revert 281130 "Replace "external_install" boolean parameter with..."

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

Issue 369863002: Revert 281130 "Replace "external_install" boolean parameter with..." (Closed) Base URL: svn://svn.chromium.org/chrome/

Patch Set: Created 6 years, 6 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 | « trunk/src/chrome/browser/apps/ephemeral_app_service.cc ('k') | trunk/src/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: trunk/src/chrome/browser/background/background_application_list_model_unittest.cc

===================================================================

--- trunk/src/chrome/browser/background/background_application_list_model_unittest.cc (revision 281226)

+++ trunk/src/chrome/browser/background/background_application_list_model_unittest.cc (working copy)

@@ -211,28 +211,23 @@

// Remove in FIFO order.

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

- service->UninstallExtension(

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

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

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

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

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

- service->UninstallExtension(

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

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

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

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

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

- service->UninstallExtension(

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

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

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

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

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

- service->UninstallExtension(

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

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

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

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

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

- service->UninstallExtension(

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

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

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

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

}

@@ -283,8 +278,7 @@

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(), ExtensionService::UNINSTALL_REASON_FOR_TESTING, NULL);

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

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

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

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

@@ -294,23 +288,19 @@

// Remove in FIFO order.

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

- service->UninstallExtension(

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

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

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

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

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

- service->UninstallExtension(

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

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

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

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

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

- service->UninstallExtension(

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

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

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

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

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

- service->UninstallExtension(

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

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

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

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

}

@@ -427,8 +417,7 @@

extensions->erase(cursor);

--*count;

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

- service->UninstallExtension(

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

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

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

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

}