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 0c3f78a371a55bc3ebae009539caf8089dcca8d1..6d5e64716a2d4b75678ebf3d5e95ce11e7d53e62 100644 |
--- a/chrome/browser/extensions/extension_service_unittest.cc |
+++ b/chrome/browser/extensions/extension_service_unittest.cc |
@@ -160,6 +160,7 @@ using extensions::FeatureSwitch; |
using extensions::Manifest; |
using extensions::PermissionSet; |
using extensions::TestExtensionSystem; |
+using extensions::UninstalledExtensionInfo; |
using extensions::UnloadedExtensionInfo; |
using extensions::URLPatternSet; |
@@ -858,10 +859,10 @@ class ExtensionServiceTest : public extensions::ExtensionServiceTestBase, |
// Uninstall it. |
if (use_helper) { |
EXPECT_TRUE(ExtensionService::UninstallExtensionHelper( |
- service(), id, ExtensionService::UNINSTALL_REASON_FOR_TESTING)); |
+ service(), id, UninstalledExtensionInfo::REASON_FOR_TESTING)); |
} else { |
EXPECT_TRUE(service()->UninstallExtension( |
- id, ExtensionService::UNINSTALL_REASON_FOR_TESTING, NULL)); |
+ id, UninstalledExtensionInfo::REASON_FOR_TESTING, NULL)); |
} |
--expected_extensions_count_; |
@@ -3728,7 +3729,7 @@ TEST_F(ExtensionServiceTest, ManagementPolicyProhibitsLoadFromPrefs) { |
const Extension* extension = |
(registry()->enabled_extensions().begin())->get(); |
EXPECT_TRUE(service()->UninstallExtension( |
- extension->id(), ExtensionService::UNINSTALL_REASON_FOR_TESTING, NULL)); |
+ extension->id(), UninstalledExtensionInfo::REASON_FOR_TESTING, NULL)); |
EXPECT_EQ(0u, registry()->enabled_extensions().size()); |
// Ensure we cannot load it if management policy prohibits installation. |
@@ -3776,7 +3777,7 @@ TEST_F(ExtensionServiceTest, ManagementPolicyProhibitsUninstall) { |
// Attempt to uninstall it. |
EXPECT_FALSE(service()->UninstallExtension( |
- good_crx, ExtensionService::UNINSTALL_REASON_FOR_TESTING, NULL)); |
+ good_crx, UninstalledExtensionInfo::REASON_FOR_TESTING, NULL)); |
EXPECT_EQ(1u, registry()->enabled_extensions().size()); |
EXPECT_TRUE(service()->GetExtensionById(good_crx, false)); |
@@ -4321,7 +4322,7 @@ TEST_F(ExtensionServiceTest, ClearExtensionData) { |
// Uninstall the extension. |
service()->UninstallExtension( |
- good_crx, ExtensionService::UNINSTALL_REASON_FOR_TESTING, NULL); |
+ good_crx, UninstalledExtensionInfo::REASON_FOR_TESTING, NULL); |
base::RunLoop().RunUntilIdle(); |
// Check that the cookie is gone. |
@@ -4514,7 +4515,7 @@ TEST_F(ExtensionServiceTest, DISABLED_LoadExtension) { |
std::string id = loaded_[0]->id(); |
EXPECT_FALSE(unloaded_id_.length()); |
service()->UninstallExtension( |
- id, ExtensionService::UNINSTALL_REASON_FOR_TESTING, NULL); |
+ id, UninstalledExtensionInfo::REASON_FOR_TESTING, NULL); |
base::RunLoop().RunUntilIdle(); |
EXPECT_EQ(id, unloaded_id_); |
ASSERT_EQ(0u, loaded_.size()); |
@@ -4627,7 +4628,7 @@ void ExtensionServiceTest::TestExternalProvider( |
bool no_uninstall = |
GetManagementPolicy()->MustRemainEnabled(loaded_[0].get(), NULL); |
service()->UninstallExtension( |
- id, ExtensionService::UNINSTALL_REASON_FOR_TESTING, NULL); |
+ id, UninstalledExtensionInfo::REASON_FOR_TESTING, NULL); |
base::RunLoop().RunUntilIdle(); |
base::FilePath install_path = extensions_install_dir().AppendASCII(id); |
@@ -4692,7 +4693,7 @@ void ExtensionServiceTest::TestExternalProvider( |
// User uninstalls. |
loaded_.clear(); |
service()->UninstallExtension( |
- id, ExtensionService::UNINSTALL_REASON_FOR_TESTING, NULL); |
+ id, UninstalledExtensionInfo::REASON_FOR_TESTING, NULL); |
base::RunLoop().RunUntilIdle(); |
ASSERT_EQ(0u, loaded_.size()); |