Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1049)

Unified Diff: chrome/browser/extensions/extension_service_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: Created 6 years, 7 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
Index: chrome/browser/extensions/extension_service_unittest.cc
diff --git a/chrome/browser/extensions/extension_service_unittest.cc b/chrome/browser/extensions/extension_service_unittest.cc
index bbbff27cd49548bf7c9fbfc000b7342a6c604ee7..1033b5aa24c2051f5c8e2f7fcdebd6c2159df001 100644
--- a/chrome/browser/extensions/extension_service_unittest.cc
+++ b/chrome/browser/extensions/extension_service_unittest.cc
@@ -1046,9 +1046,11 @@ class ExtensionServiceTest
// Uninstall it.
if (use_helper) {
- EXPECT_TRUE(ExtensionService::UninstallExtensionHelper(service_, id));
+ EXPECT_TRUE(ExtensionService::UninstallExtensionHelper(
+ service_, id, ExtensionService::kUninstallReasonDefault));
} else {
- EXPECT_TRUE(service_->UninstallExtension(id, false, NULL));
+ EXPECT_TRUE(service_->UninstallExtension(
+ id, ExtensionService::kUninstallReasonDefault, NULL));
}
--expected_extensions_count_;
@@ -3800,7 +3802,8 @@ TEST_F(ExtensionServiceTest, ManagementPolicyProhibitsLoadFromPrefs) {
EXPECT_EQ(1u, registry_->enabled_extensions().size());
const Extension* extension = (registry_->enabled_extensions().begin())->get();
- EXPECT_TRUE(service_->UninstallExtension(extension->id(), false, NULL));
+ EXPECT_TRUE(service_->UninstallExtension(
+ extension->id(), ExtensionService::kUninstallReasonDefault, NULL));
EXPECT_EQ(0u, registry_->enabled_extensions().size());
// Ensure we cannot load it if management policy prohibits installation.
@@ -3847,7 +3850,8 @@ TEST_F(ExtensionServiceTest, ManagementPolicyProhibitsUninstall) {
management_policy_->RegisterProvider(&provider);
// Attempt to uninstall it.
- EXPECT_FALSE(service_->UninstallExtension(good_crx, false, NULL));
+ EXPECT_FALSE(service_->UninstallExtension(
+ good_crx, ExtensionService::kUninstallReasonDefault, NULL));
EXPECT_EQ(1u, registry_->enabled_extensions().size());
EXPECT_TRUE(service_->GetExtensionById(good_crx, false));
@@ -4389,7 +4393,8 @@ TEST_F(ExtensionServiceTest, ClearExtensionData) {
EXPECT_TRUE(base::DirectoryExists(idb_path));
// Uninstall the extension.
- service_->UninstallExtension(good_crx, false, NULL);
+ service_->UninstallExtension(
+ good_crx, ExtensionService::kUninstallReasonDefault, NULL);
base::RunLoop().RunUntilIdle();
// Check that the cookie is gone.
@@ -4578,7 +4583,8 @@ TEST_F(ExtensionServiceTest, DISABLED_LoadExtension) {
// Test uninstall.
std::string id = loaded_[0]->id();
EXPECT_FALSE(unloaded_id_.length());
- service_->UninstallExtension(id, false, NULL);
+ service_->UninstallExtension(
+ id, ExtensionService::kUninstallReasonDefault, NULL);
base::RunLoop().RunUntilIdle();
EXPECT_EQ(id, unloaded_id_);
ASSERT_EQ(0u, loaded_.size());
@@ -4690,7 +4696,8 @@ void ExtensionServiceTest::TestExternalProvider(
std::string id = loaded_[0]->id();
bool no_uninstall =
management_policy_->MustRemainEnabled(loaded_[0].get(), NULL);
- service_->UninstallExtension(id, false, NULL);
+ service_->UninstallExtension(
+ id, ExtensionService::kUninstallReasonDefault, NULL);
base::RunLoop().RunUntilIdle();
base::FilePath install_path = extensions_install_dir_.AppendASCII(id);
@@ -4754,7 +4761,8 @@ void ExtensionServiceTest::TestExternalProvider(
// User uninstalls.
loaded_.clear();
- service_->UninstallExtension(id, false, NULL);
+ service_->UninstallExtension(
+ id, ExtensionService::kUninstallReasonDefault, NULL);
base::RunLoop().RunUntilIdle();
ASSERT_EQ(0u, loaded_.size());

Powered by Google App Engine
This is Rietveld 408576698