Re-enable the ExtensionServiceTest tests.
This requires adding a workaround in ExtensionService::IsExtensionIdle() to prevent it from accessing ExtensionProcessManager and EventRouter components that aren't currently available during test.
This CL also adds DCHECKs of ExtensionSystem::event_router() in extensions::RuntimeEventRouter calls.
BUG=159754,149157,160796
Review URL: https://chromiumcodereview.appspot.com/11363214
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@167575 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/chrome/browser/extensions/extension_service_unittest.cc b/chrome/browser/extensions/extension_service_unittest.cc
index 760db1a..57042ddd 100644
--- a/chrome/browser/extensions/extension_service_unittest.cc
+++ b/chrome/browser/extensions/extension_service_unittest.cc
@@ -1063,11 +1063,8 @@
FAIL() << "Existing CRX should have been overwritten.";
}
-// All tests in the file have been disabled because they are causing tree
-// instability. Please fix. http://crbug.com/149157
-
// Test loading good extensions from the profile directory.
-TEST_F(ExtensionServiceTest, DISABLED_LoadAllExtensionsFromDirectorySuccess) {
+TEST_F(ExtensionServiceTest, LoadAllExtensionsFromDirectorySuccess) {
PluginService::GetInstance()->Init();
// Initialize the test dir with a good Preferences/extensions.
@@ -1170,7 +1167,7 @@
};
// Test loading bad extensions from the profile directory.
-TEST_F(ExtensionServiceTest, DISABLED_LoadAllExtensionsFromDirectoryFail) {
+TEST_F(ExtensionServiceTest, LoadAllExtensionsFromDirectoryFail) {
// Initialize the test dir with a bad Preferences/extensions.
FilePath source_install_dir = data_dir_
.AppendASCII("bad")
@@ -1209,7 +1206,7 @@
// Test that partially deleted extensions are cleaned up during startup
// Test loading bad extensions from the profile directory.
-TEST_F(ExtensionServiceTest, DISABLED_CleanupOnStartup) {
+TEST_F(ExtensionServiceTest, CleanupOnStartup) {
PluginService::GetInstance()->Init();
FilePath source_install_dir = data_dir_
@@ -1323,7 +1320,7 @@
// Test installing extensions. This test tries to install few extensions using
// crx files. If you need to change those crx files, feel free to repackage
// them, throw away the key used and change the id's above.
-TEST_F(ExtensionServiceTest, DISABLED_InstallExtension) {
+TEST_F(ExtensionServiceTest, InstallExtension) {
InitializeEmptyExtensionService();
// Extensions not enabled.
@@ -1380,7 +1377,7 @@
// Tests that flags passed to OnExternalExtensionFileFound() make it to the
// extension object.
-TEST_F(ExtensionServiceTest, DISABLED_InstallingExternalExtensionWithFlags) {
+TEST_F(ExtensionServiceTest, InstallingExternalExtensionWithFlags) {
const char kPrefFromBookmark[] = "from_bookmark";
InitializeEmptyExtensionService();
@@ -1414,7 +1411,7 @@
}
// Test the handling of Extension::EXTERNAL_EXTENSION_UNINSTALLED
-TEST_F(ExtensionServiceTest, DISABLED_UninstallingExternalExtensions) {
+TEST_F(ExtensionServiceTest, UninstallingExternalExtensions) {
InitializeEmptyExtensionService();
FilePath path = data_dir_.AppendASCII("good.crx");
@@ -1466,7 +1463,7 @@
// the extension could not be loaded.
// This extension shown in preferences file requires an experimental permission.
// It could not be loaded without such permission.
-TEST_F(ExtensionServiceTest, DISABLED_UninstallingNotLoadedExtension) {
+TEST_F(ExtensionServiceTest, UninstallingNotLoadedExtension) {
FilePath source_install_dir = data_dir_
.AppendASCII("good")
.AppendASCII("Extensions");
@@ -1491,7 +1488,7 @@
}
// Test that external extensions with incorrect IDs are not installed.
-TEST_F(ExtensionServiceTest, DISABLED_FailOnWrongId) {
+TEST_F(ExtensionServiceTest, FailOnWrongId) {
InitializeEmptyExtensionService();
FilePath path = data_dir_.AppendASCII("good.crx");
set_extensions_enabled(true);
@@ -1520,7 +1517,7 @@
}
// Test that external extensions with incorrect versions are not installed.
-TEST_F(ExtensionServiceTest, DISABLED_FailOnWrongVersion) {
+TEST_F(ExtensionServiceTest, FailOnWrongVersion) {
InitializeEmptyExtensionService();
FilePath path = data_dir_.AppendASCII("good.crx");
set_extensions_enabled(true);
@@ -1546,7 +1543,7 @@
}
// Install a user script (they get converted automatically to an extension)
-TEST_F(ExtensionServiceTest, DISABLED_InstallUserScript) {
+TEST_F(ExtensionServiceTest, InstallUserScript) {
// The details of script conversion are tested elsewhere, this just tests
// integration with ExtensionService.
InitializeEmptyExtensionService();
@@ -1576,7 +1573,7 @@
}
// Extensions don't install during shutdown.
-TEST_F(ExtensionServiceTest, DISABLED_InstallExtensionDuringShutdown) {
+TEST_F(ExtensionServiceTest, InstallExtensionDuringShutdown) {
InitializeEmptyExtensionService();
// Simulate shutdown.
@@ -1594,7 +1591,7 @@
// This tests that the granted permissions preferences are correctly set when
// installing an extension.
-TEST_F(ExtensionServiceTest, DISABLED_GrantedPermissions) {
+TEST_F(ExtensionServiceTest, GrantedPermissions) {
InitializeEmptyExtensionService();
FilePath path = data_dir_
.AppendASCII("permissions");
@@ -1642,7 +1639,7 @@
#if !defined(OS_CHROMEOS)
// This tests that the granted permissions preferences are correctly set for
// default apps.
-TEST_F(ExtensionServiceTest, DISABLED_DefaultAppsGrantedPermissions) {
+TEST_F(ExtensionServiceTest, DefaultAppsGrantedPermissions) {
InitializeEmptyExtensionService();
InitializeRequestContext();
FilePath path = data_dir_
@@ -1687,7 +1684,7 @@
// Tests that the granted permissions full_access bit gets set correctly when
// an extension contains an NPAPI plugin. Don't run this test on Chrome OS
// since they don't support plugins.
-TEST_F(ExtensionServiceTest, DISABLED_GrantedFullAccessPermissions) {
+TEST_F(ExtensionServiceTest, GrantedFullAccessPermissions) {
PluginService::GetInstance()->Init();
InitializeEmptyExtensionService();
@@ -1719,7 +1716,7 @@
// Tests that the extension is disabled when permissions are missing from
// the extension's granted permissions preferences. (This simulates updating
// the browser to a version which recognizes more permissions).
-TEST_F(ExtensionServiceTest, DISABLED_GrantedAPIAndHostPermissions) {
+TEST_F(ExtensionServiceTest, GrantedAPIAndHostPermissions) {
InitializeEmptyExtensionService();
FilePath path = data_dir_
@@ -1819,7 +1816,7 @@
}
// Test Packaging and installing an extension.
-TEST_F(ExtensionServiceTest, DISABLED_PackExtension) {
+TEST_F(ExtensionServiceTest, PackExtension) {
InitializeEmptyExtensionService();
FilePath input_directory = data_dir_
.AppendASCII("good")
@@ -1882,7 +1879,7 @@
}
// Test Packaging and installing an extension whose name contains punctuation.
-TEST_F(ExtensionServiceTest, DISABLED_PackPunctuatedExtension) {
+TEST_F(ExtensionServiceTest, PackPunctuatedExtension) {
InitializeEmptyExtensionService();
FilePath input_directory = data_dir_
.AppendASCII("good")
@@ -1944,7 +1941,7 @@
}
}
-TEST_F(ExtensionServiceTest, DISABLED_PackExtensionContainingKeyFails) {
+TEST_F(ExtensionServiceTest, PackExtensionContainingKeyFails) {
InitializeEmptyExtensionService();
ScopedTempDir extension_temp_dir;
@@ -1993,7 +1990,7 @@
// > openssl pkcs8 -topk8 -nocrypt -in privkey.pem -out privkey_asn1.pem
// The privkey.pem is a PrivateKey, and the pcks8 -topk8 creates a
// PrivateKeyInfo ASN.1 structure, we our RSAPrivateKey expects.
-TEST_F(ExtensionServiceTest, DISABLED_PackExtensionOpenSSLKey) {
+TEST_F(ExtensionServiceTest, PackExtensionOpenSSLKey) {
InitializeEmptyExtensionService();
FilePath input_directory = data_dir_
.AppendASCII("good")
@@ -2017,7 +2014,7 @@
InstallCRX(crx_path, INSTALL_NEW);
}
-TEST_F(ExtensionServiceTest, DISABLED_InstallTheme) {
+TEST_F(ExtensionServiceTest, InstallTheme) {
InitializeEmptyExtensionService();
// A theme.
@@ -2055,7 +2052,7 @@
ValidatePrefKeyCount(pref_count);
}
-TEST_F(ExtensionServiceTest, DISABLED_LoadLocalizedTheme) {
+TEST_F(ExtensionServiceTest, LoadLocalizedTheme) {
// Load.
InitializeEmptyExtensionService();
FilePath extension_path = data_dir_
@@ -2073,7 +2070,7 @@
// Tests that we can change the ID of an unpacked extension by adding a key
// to its manifest.
-TEST_F(ExtensionServiceTest, DISABLED_UnpackedExtensionCanChangeID) {
+TEST_F(ExtensionServiceTest, UnpackedExtensionCanChangeID) {
InitializeEmptyExtensionService();
ScopedTempDir temp;
@@ -2116,7 +2113,7 @@
}
#if defined(OS_POSIX)
-TEST_F(ExtensionServiceTest, DISABLED_UnpackedExtensionMayContainSymlinkedFiles) {
+TEST_F(ExtensionServiceTest, UnpackedExtensionMayContainSymlinkedFiles) {
FilePath source_data_dir = data_dir_.
AppendASCII("unpacked").
AppendASCII("symlinks_allowed");
@@ -2147,7 +2144,7 @@
}
#endif
-TEST_F(ExtensionServiceTest, DISABLED_InstallLocalizedTheme) {
+TEST_F(ExtensionServiceTest, InstallLocalizedTheme) {
InitializeEmptyExtensionService();
FilePath theme_path = data_dir_
.AppendASCII("theme_i18n");
@@ -2160,7 +2157,7 @@
EXPECT_EQ("description", theme->description());
}
-TEST_F(ExtensionServiceTest, DISABLED_InstallApps) {
+TEST_F(ExtensionServiceTest, InstallApps) {
InitializeEmptyExtensionService();
// An empty app.
@@ -2182,7 +2179,7 @@
}
// Tests that file access is OFF by default.
-TEST_F(ExtensionServiceTest, DISABLED_DefaultFileAccess) {
+TEST_F(ExtensionServiceTest, DefaultFileAccess) {
InitializeEmptyExtensionService();
const Extension* extension =
PackAndInstallCRX(data_dir_
@@ -2194,7 +2191,7 @@
EXPECT_FALSE(service_->extension_prefs()->AllowFileAccess(extension->id()));
}
-TEST_F(ExtensionServiceTest, DISABLED_UpdateApps) {
+TEST_F(ExtensionServiceTest, UpdateApps) {
InitializeEmptyExtensionService();
FilePath extensions_path = data_dir_.AppendASCII("app_update");
@@ -2214,7 +2211,7 @@
}
// Verifies that the NTP page and launch ordinals are kept when updating apps.
-TEST_F(ExtensionServiceTest, DISABLED_UpdateAppsRetainOrdinals) {
+TEST_F(ExtensionServiceTest, UpdateAppsRetainOrdinals) {
InitializeEmptyExtensionService();
ExtensionSorting* sorting = service_->extension_prefs()->extension_sorting();
FilePath extensions_path = data_dir_.AppendASCII("app_update");
@@ -2246,7 +2243,7 @@
}
// Ensures that the CWS has properly initialized ordinals.
-TEST_F(ExtensionServiceTest, DISABLED_EnsureCWSOrdinalsInitialized) {
+TEST_F(ExtensionServiceTest, EnsureCWSOrdinalsInitialized) {
InitializeEmptyExtensionService();
service_->component_loader()->Add(IDR_WEBSTORE_MANIFEST,
FilePath(FILE_PATH_LITERAL("web_store")));
@@ -2267,7 +2264,7 @@
#define MAYBE_InstallAppsWithUnlimitedStorage InstallAppsWithUnlimitedStorage
#endif
-TEST_F(ExtensionServiceTest, DISABLED_MAYBE_InstallAppsWithUnlimitedStorage) {
+TEST_F(ExtensionServiceTest, MAYBE_InstallAppsWithUnlimitedStorage) {
InitializeEmptyExtensionService();
InitializeRequestContext();
EXPECT_TRUE(service_->extensions()->is_empty());
@@ -2317,7 +2314,7 @@
IsStorageUnlimited(origin2));
}
-TEST_F(ExtensionServiceTest, DISABLED_InstallAppsAndCheckStorageProtection) {
+TEST_F(ExtensionServiceTest, InstallAppsAndCheckStorageProtection) {
InitializeEmptyExtensionService();
InitializeRequestContext();
EXPECT_TRUE(service_->extensions()->is_empty());
@@ -2357,7 +2354,7 @@
}
// Test that when an extension version is reinstalled, nothing happens.
-TEST_F(ExtensionServiceTest, DISABLED_Reinstall) {
+TEST_F(ExtensionServiceTest, Reinstall) {
InitializeEmptyExtensionService();
// A simple extension that should install without error.
@@ -2378,7 +2375,7 @@
// Test that we can determine if extensions came from the
// Chrome web store.
-TEST_F(ExtensionServiceTest, DISABLED_FromWebStore) {
+TEST_F(ExtensionServiceTest, FromWebStore) {
InitializeEmptyExtensionService();
// A simple extension that should install without error.
@@ -2410,7 +2407,7 @@
}
// Test upgrading a signed extension.
-TEST_F(ExtensionServiceTest, DISABLED_UpgradeSignedGood) {
+TEST_F(ExtensionServiceTest, UpgradeSignedGood) {
InitializeEmptyExtensionService();
FilePath path = data_dir_.AppendASCII("good.crx");
@@ -2430,7 +2427,7 @@
}
// Test upgrading a signed extension with a bad signature.
-TEST_F(ExtensionServiceTest, DISABLED_UpgradeSignedBad) {
+TEST_F(ExtensionServiceTest, UpgradeSignedBad) {
InitializeEmptyExtensionService();
FilePath path = data_dir_.AppendASCII("good.crx");
@@ -2443,7 +2440,7 @@
}
// Test a normal update via the UpdateExtension API
-TEST_F(ExtensionServiceTest, DISABLED_UpdateExtension) {
+TEST_F(ExtensionServiceTest, UpdateExtension) {
InitializeEmptyExtensionService();
FilePath path = data_dir_.AppendASCII("good.crx");
@@ -2460,7 +2457,7 @@
}
// Extensions should not be updated during browser shutdown.
-TEST_F(ExtensionServiceTest, DISABLED_UpdateExtensionDuringShutdown) {
+TEST_F(ExtensionServiceTest, UpdateExtensionDuringShutdown) {
InitializeEmptyExtensionService();
// Install an extension.
@@ -2481,7 +2478,7 @@
}
// Test updating a not-already-installed extension - this should fail
-TEST_F(ExtensionServiceTest, DISABLED_UpdateNotInstalledExtension) {
+TEST_F(ExtensionServiceTest, UpdateNotInstalledExtension) {
InitializeEmptyExtensionService();
FilePath path = data_dir_.AppendASCII("good.crx");
@@ -2494,7 +2491,7 @@
}
// Makes sure you can't downgrade an extension via UpdateExtension
-TEST_F(ExtensionServiceTest, DISABLED_UpdateWillNotDowngrade) {
+TEST_F(ExtensionServiceTest, UpdateWillNotDowngrade) {
InitializeEmptyExtensionService();
FilePath path = data_dir_.AppendASCII("good2.crx");
@@ -2512,7 +2509,7 @@
}
// Make sure calling update with an identical version does nothing
-TEST_F(ExtensionServiceTest, DISABLED_UpdateToSameVersionIsNoop) {
+TEST_F(ExtensionServiceTest, UpdateToSameVersionIsNoop) {
InitializeEmptyExtensionService();
FilePath path = data_dir_.AppendASCII("good.crx");
@@ -2523,7 +2520,7 @@
}
// Tests that updating an extension does not clobber old state.
-TEST_F(ExtensionServiceTest, DISABLED_UpdateExtensionPreservesState) {
+TEST_F(ExtensionServiceTest, UpdateExtensionPreservesState) {
InitializeEmptyExtensionService();
FilePath path = data_dir_.AppendASCII("good.crx");
@@ -2549,7 +2546,7 @@
}
// Tests that updating preserves extension location.
-TEST_F(ExtensionServiceTest, DISABLED_UpdateExtensionPreservesLocation) {
+TEST_F(ExtensionServiceTest, UpdateExtensionPreservesLocation) {
InitializeEmptyExtensionService();
FilePath path = data_dir_.AppendASCII("good.crx");
@@ -2568,7 +2565,7 @@
}
// Makes sure that LOAD extension types can downgrade.
-TEST_F(ExtensionServiceTest, DISABLED_LoadExtensionsCanDowngrade) {
+TEST_F(ExtensionServiceTest, LoadExtensionsCanDowngrade) {
InitializeEmptyExtensionService();
ScopedTempDir temp;
@@ -2615,7 +2612,7 @@
#if !defined(OS_CHROMEOS)
// LOAD extensions with plugins require approval.
-TEST_F(ExtensionServiceTest, DISABLED_LoadExtensionsWithPlugins) {
+TEST_F(ExtensionServiceTest, LoadExtensionsWithPlugins) {
FilePath extension_with_plugin_path = data_dir_
.AppendASCII("good")
.AppendASCII("Extensions")
@@ -2702,7 +2699,7 @@
} // namespace
// Test adding a pending extension.
-TEST_F(ExtensionServiceTest, DISABLED_AddPendingExtensionFromSync) {
+TEST_F(ExtensionServiceTest, AddPendingExtensionFromSync) {
InitializeEmptyExtensionService();
const std::string kFakeId(all_zero);
@@ -2729,7 +2726,7 @@
} // namespace
// Test updating a pending extension.
-TEST_F(ExtensionServiceTest, DISABLED_UpdatePendingExtension) {
+TEST_F(ExtensionServiceTest, UpdatePendingExtension) {
InitializeEmptyExtensionService();
EXPECT_TRUE(service_->pending_extension_manager()->AddFromSync(
kGoodId, GURL(kGoodUpdateURL), &IsExtension,
@@ -2755,7 +2752,7 @@
// Test updating a pending theme.
// Disabled due to ASAN failure. http://crbug.com/108320
-TEST_F(ExtensionServiceTest, DISABLED_DISABLED_UpdatePendingTheme) {
+TEST_F(ExtensionServiceTest, DISABLED_UpdatePendingTheme) {
InitializeEmptyExtensionService();
EXPECT_TRUE(service_->pending_extension_manager()->AddFromSync(
theme_crx, GURL(), &IsTheme, false));
@@ -2783,7 +2780,7 @@
// Test updating a pending CRX as if the source is an external extension
// with an update URL. In this case we don't know if the CRX is a theme
// or not.
-TEST_F(ExtensionServiceTest, DISABLED_MAYBE_UpdatePendingExternalCrx) {
+TEST_F(ExtensionServiceTest, MAYBE_UpdatePendingExternalCrx) {
InitializeEmptyExtensionService();
EXPECT_TRUE(service_->pending_extension_manager()->AddFromExternalUpdateUrl(
theme_crx, GURL(), Extension::EXTERNAL_PREF_DOWNLOAD));
@@ -2807,7 +2804,7 @@
// Test updating a pending CRX as if the source is an external extension
// with an update URL. The external update should overwrite a sync update,
// but a sync update should not overwrite a non-sync update.
-TEST_F(ExtensionServiceTest, DISABLED_UpdatePendingExternalCrxWinsOverSync) {
+TEST_F(ExtensionServiceTest, UpdatePendingExternalCrxWinsOverSync) {
InitializeEmptyExtensionService();
// Add a crx to be installed from the update mechanism.
@@ -2847,7 +2844,7 @@
// Updating a theme should fail if the updater is explicitly told that
// the CRX is not a theme.
-TEST_F(ExtensionServiceTest, DISABLED_UpdatePendingCrxThemeMismatch) {
+TEST_F(ExtensionServiceTest, UpdatePendingCrxThemeMismatch) {
InitializeEmptyExtensionService();
EXPECT_TRUE(service_->pending_extension_manager()->AddFromSync(
theme_crx, GURL(), &IsExtension, true));
@@ -2868,7 +2865,7 @@
// UpdateExtension().
// Test updating a pending extension which fails the should-install test.
-TEST_F(ExtensionServiceTest, DISABLED_UpdatePendingExtensionFailedShouldInstallTest) {
+TEST_F(ExtensionServiceTest, UpdatePendingExtensionFailedShouldInstallTest) {
InitializeEmptyExtensionService();
// Add pending extension with a flipped is_theme.
EXPECT_TRUE(service_->pending_extension_manager()->AddFromSync(
@@ -2888,7 +2885,7 @@
// unsyncable extensions are blocked.
// Test updating a pending extension for one that is not pending.
-TEST_F(ExtensionServiceTest, DISABLED_UpdatePendingExtensionNotPending) {
+TEST_F(ExtensionServiceTest, UpdatePendingExtensionNotPending) {
InitializeEmptyExtensionService();
FilePath path = data_dir_.AppendASCII("good.crx");
@@ -2899,7 +2896,7 @@
// Test updating a pending extension for one that is already
// installed.
-TEST_F(ExtensionServiceTest, DISABLED_UpdatePendingExtensionAlreadyInstalled) {
+TEST_F(ExtensionServiceTest, UpdatePendingExtensionAlreadyInstalled) {
InitializeEmptyExtensionService();
FilePath path = data_dir_.AppendASCII("good.crx");
@@ -2918,7 +2915,7 @@
}
// Test pref settings for blacklist and unblacklist extensions.
-TEST_F(ExtensionServiceTest, DISABLED_SetUnsetBlacklistInPrefs) {
+TEST_F(ExtensionServiceTest, SetUnsetBlacklistInPrefs) {
InitializeEmptyExtensionService();
std::vector<std::string> blacklist;
blacklist.push_back(good0);
@@ -2947,7 +2944,7 @@
}
// Unload installed extension from blacklist.
-TEST_F(ExtensionServiceTest, DISABLED_UnloadBlacklistedExtension) {
+TEST_F(ExtensionServiceTest, UnloadBlacklistedExtension) {
InitializeEmptyExtensionService();
FilePath path = data_dir_.AppendASCII("good.crx");
@@ -2976,7 +2973,7 @@
}
// Unload installed extension from blacklist.
-TEST_F(ExtensionServiceTest, DISABLED_BlacklistedExtensionWillNotInstall) {
+TEST_F(ExtensionServiceTest, BlacklistedExtensionWillNotInstall) {
InitializeEmptyExtensionService();
std::vector<std::string> blacklist;
blacklist.push_back(good_crx);
@@ -2995,7 +2992,7 @@
}
// Unload blacklisted extension on policy change.
-TEST_F(ExtensionServiceTest, DISABLED_UnloadBlacklistedExtensionPolicy) {
+TEST_F(ExtensionServiceTest, UnloadBlacklistedExtensionPolicy) {
InitializeEmptyExtensionService();
FilePath path = data_dir_.AppendASCII("good.crx");
@@ -3028,7 +3025,7 @@
// Allow Google-blacklisted extension if policy explicitly allows it (blacklist
// then set policy).
-TEST_F(ExtensionServiceTest, DISABLED_WhitelistGoogleBlacklistedExtension) {
+TEST_F(ExtensionServiceTest, WhitelistGoogleBlacklistedExtension) {
InitializeEmptyExtensionService();
std::vector<std::string> blacklist;
@@ -3048,7 +3045,7 @@
// Allow Google-blacklisted extension if policy requires it (blacklist then set
// policy).
-TEST_F(ExtensionServiceTest, DISABLED_ForcelistGoogleBlacklistedExtension) {
+TEST_F(ExtensionServiceTest, ForcelistGoogleBlacklistedExtension) {
InitializeEmptyExtensionService();
std::vector<std::string> blacklist;
@@ -3068,7 +3065,7 @@
// Allow Google-blacklisted extension if policy explicitly allows it (set policy
// then blacklist).
-TEST_F(ExtensionServiceTest, DISABLED_GoogleBlacklistWhitelistedExtension) {
+TEST_F(ExtensionServiceTest, GoogleBlacklistWhitelistedExtension) {
InitializeEmptyExtensionService();
base::ListValue whitelist;
@@ -3085,7 +3082,7 @@
// Allow Google-blacklisted extension if policy requires it (set policy then
// blacklist).
-TEST_F(ExtensionServiceTest, DISABLED_GoogleBlacklistForcelistedExtension) {
+TEST_F(ExtensionServiceTest, GoogleBlacklistForcelistedExtension) {
InitializeEmptyExtensionService();
base::ListValue forcelist;
@@ -3102,7 +3099,7 @@
// Test loading extensions from the profile directory, except
// blacklisted ones.
-TEST_F(ExtensionServiceTest, DISABLED_WillNotLoadBlacklistedExtensionsFromDirectory) {
+TEST_F(ExtensionServiceTest, WillNotLoadBlacklistedExtensionsFromDirectory) {
// Initialize the test dir with a good Preferences/extensions.
FilePath source_install_dir = data_dir_
.AppendASCII("good")
@@ -3135,7 +3132,7 @@
}
// Will not install extension blacklisted by policy.
-TEST_F(ExtensionServiceTest, DISABLED_BlacklistedByPolicyWillNotInstall) {
+TEST_F(ExtensionServiceTest, BlacklistedByPolicyWillNotInstall) {
InitializeEmptyExtensionService();
// Blacklist everything.
@@ -3165,7 +3162,7 @@
}
// Extension blacklisted by policy get unloaded after installing.
-TEST_F(ExtensionServiceTest, DISABLED_BlacklistedByPolicyRemovedIfRunning) {
+TEST_F(ExtensionServiceTest, BlacklistedByPolicyRemovedIfRunning) {
InitializeEmptyExtensionService();
// Install good_crx.
@@ -3189,7 +3186,7 @@
}
// Tests that component extensions are not blacklisted by policy.
-TEST_F(ExtensionServiceTest, DISABLED_ComponentExtensionWhitelisted) {
+TEST_F(ExtensionServiceTest, ComponentExtensionWhitelisted) {
InitializeEmptyExtensionService();
// Blacklist everything.
@@ -3234,7 +3231,7 @@
}
// Tests that policy-installed extensions are not blacklisted by policy.
-TEST_F(ExtensionServiceTest, DISABLED_PolicyInstalledExtensionsWhitelisted) {
+TEST_F(ExtensionServiceTest, PolicyInstalledExtensionsWhitelisted) {
InitializeEmptyExtensionService();
// Blacklist everything.
@@ -3276,7 +3273,7 @@
// Tests that extensions cannot be installed if the policy provider prohibits
// it. This functionality is implemented in CrxInstaller::ConfirmInstall().
-TEST_F(ExtensionServiceTest, DISABLED_ManagementPolicyProhibitsInstall) {
+TEST_F(ExtensionServiceTest, ManagementPolicyProhibitsInstall) {
InitializeEmptyExtensionService();
management_policy_->UnregisterAllProviders();
@@ -3290,7 +3287,7 @@
// Tests that extensions cannot be loaded from prefs if the policy provider
// prohibits it. This functionality is implemented in InstalledLoader::Load().
-TEST_F(ExtensionServiceTest, DISABLED_ManagementPolicyProhibitsLoadFromPrefs) {
+TEST_F(ExtensionServiceTest, ManagementPolicyProhibitsLoadFromPrefs) {
InitializeEmptyExtensionService();
// Create a fake extension to be loaded as though it were read from prefs.
@@ -3325,7 +3322,7 @@
}
// Tests disabling an extension when prohibited by the ManagementPolicy.
-TEST_F(ExtensionServiceTest, DISABLED_ManagementPolicyProhibitsDisable) {
+TEST_F(ExtensionServiceTest, ManagementPolicyProhibitsDisable) {
InitializeEmptyExtensionService();
InstallCRX(data_dir_.AppendASCII("good.crx"), INSTALL_NEW);
@@ -3346,7 +3343,7 @@
}
// Tests uninstalling an extension when prohibited by the ManagementPolicy.
-TEST_F(ExtensionServiceTest, DISABLED_ManagementPolicyProhibitsUninstall) {
+TEST_F(ExtensionServiceTest, ManagementPolicyProhibitsUninstall) {
InitializeEmptyExtensionService();
InstallCRX(data_dir_.AppendASCII("good.crx"), INSTALL_NEW);
@@ -3367,7 +3364,7 @@
// Tests that previously installed extensions that are now prohibited from
// being installed are removed.
-TEST_F(ExtensionServiceTest, DISABLED_ManagementPolicyUnloadsAllProhibited) {
+TEST_F(ExtensionServiceTest, ManagementPolicyUnloadsAllProhibited) {
InitializeEmptyExtensionService();
InstallCRX(data_dir_.AppendASCII("good.crx"), INSTALL_NEW);
@@ -3388,7 +3385,7 @@
// Tests that previously disabled extensions that are now required to be
// enabled are re-enabled on reinstall.
-TEST_F(ExtensionServiceTest, DISABLED_ManagementPolicyRequiresEnable) {
+TEST_F(ExtensionServiceTest, ManagementPolicyRequiresEnable) {
InitializeEmptyExtensionService();
// Install, then disable, an extension.
@@ -3410,7 +3407,7 @@
EXPECT_EQ(0u, service_->disabled_extensions()->size());
}
-TEST_F(ExtensionServiceTest, DISABLED_ExternalExtensionAutoAcknowledgement) {
+TEST_F(ExtensionServiceTest, ExternalExtensionAutoAcknowledgement) {
InitializeEmptyExtensionService();
set_extensions_enabled(true);
@@ -3446,7 +3443,7 @@
#if !defined(OS_CHROMEOS)
// This tests if default apps are installed correctly.
-TEST_F(ExtensionServiceTest, DISABLED_DefaultAppsInstall) {
+TEST_F(ExtensionServiceTest, DefaultAppsInstall) {
InitializeEmptyExtensionService();
InitializeRequestContext();
set_extensions_enabled(true);
@@ -3486,7 +3483,7 @@
#endif
// Tests disabling extensions
-TEST_F(ExtensionServiceTest, DISABLED_DisableExtension) {
+TEST_F(ExtensionServiceTest, DisableExtension) {
InitializeEmptyExtensionService();
InstallCRX(data_dir_.AppendASCII("good.crx"), INSTALL_NEW);
@@ -3504,7 +3501,7 @@
EXPECT_FALSE(service_->disabled_extensions()->is_empty());
}
-TEST_F(ExtensionServiceTest, DISABLED_DisableTerminatedExtension) {
+TEST_F(ExtensionServiceTest, DisableTerminatedExtension) {
InitializeEmptyExtensionService();
InstallCRX(data_dir_.AppendASCII("good.crx"), INSTALL_NEW);
@@ -3520,7 +3517,7 @@
}
// Tests disabling all extensions (simulating --disable-extensions flag).
-TEST_F(ExtensionServiceTest, DISABLED_DisableAllExtensions) {
+TEST_F(ExtensionServiceTest, DisableAllExtensions) {
InitializeEmptyExtensionService();
FilePath path = data_dir_.AppendASCII("good.crx");
@@ -3554,7 +3551,7 @@
}
// Tests reloading extensions.
-TEST_F(ExtensionServiceTest, DISABLED_ReloadExtensions) {
+TEST_F(ExtensionServiceTest, ReloadExtensions) {
InitializeEmptyExtensionService();
InitializeRequestContext();
@@ -3596,7 +3593,7 @@
EXPECT_EQ(0u, service_->disabled_extensions()->size());
}
-TEST_F(ExtensionServiceTest, DISABLED_UninstallExtension) {
+TEST_F(ExtensionServiceTest, UninstallExtension) {
InitializeEmptyExtensionService();
InstallCRX(data_dir_.AppendASCII("good.crx"), INSTALL_NEW);
EXPECT_EQ(1u, service_->extensions()->size());
@@ -3604,7 +3601,7 @@
EXPECT_EQ(0u, service_->extensions()->size());
}
-TEST_F(ExtensionServiceTest, DISABLED_UninstallTerminatedExtension) {
+TEST_F(ExtensionServiceTest, UninstallTerminatedExtension) {
InitializeEmptyExtensionService();
InstallCRX(data_dir_.AppendASCII("good.crx"), INSTALL_NEW);
TerminateExtension(good_crx);
@@ -3612,13 +3609,13 @@
}
// Tests the uninstaller helper.
-TEST_F(ExtensionServiceTest, DISABLED_UninstallExtensionHelper) {
+TEST_F(ExtensionServiceTest, UninstallExtensionHelper) {
InitializeEmptyExtensionService();
InstallCRX(data_dir_.AppendASCII("good.crx"), INSTALL_NEW);
UninstallExtension(good_crx, true);
}
-TEST_F(ExtensionServiceTest, DISABLED_UninstallExtensionHelperTerminated) {
+TEST_F(ExtensionServiceTest, UninstallExtensionHelperTerminated) {
InitializeEmptyExtensionService();
InstallCRX(data_dir_.AppendASCII("good.crx"), INSTALL_NEW);
TerminateExtension(good_crx);
@@ -3628,7 +3625,7 @@
// An extension disabled because of unsupported requirements should re-enabled
// if updated to a version with supported requirements as long as there are no
// other disable reasons.
-TEST_F(ExtensionServiceTest, DISABLED_UpgradingRequirementsEnabled) {
+TEST_F(ExtensionServiceTest, UpgradingRequirementsEnabled) {
InitializeEmptyExtensionService();
BlackListWebGL();
@@ -3653,7 +3650,7 @@
}
// Extensions disabled through user action should stay disabled.
-TEST_F(ExtensionServiceTest, DISABLED_UpgradingRequirementsDisabled) {
+TEST_F(ExtensionServiceTest, UpgradingRequirementsDisabled) {
InitializeEmptyExtensionService();
BlackListWebGL();
@@ -3680,7 +3677,7 @@
// The extension should not re-enabled because it was disabled from a
// permission increase.
-TEST_F(ExtensionServiceTest, DISABLED_UpgradingRequirementsPermissions) {
+TEST_F(ExtensionServiceTest, UpgradingRequirementsPermissions) {
InitializeEmptyExtensionService();
BlackListWebGL();
@@ -3708,7 +3705,7 @@
// Unpacked extensions are not allowed to be installed if they have unsupported
// requirements.
-TEST_F(ExtensionServiceTest, DISABLED_UnpackedRequirements) {
+TEST_F(ExtensionServiceTest, UnpackedRequirements) {
InitializeEmptyExtensionService();
BlackListWebGL();
@@ -3743,7 +3740,7 @@
};
// Verifies extension state is removed upon uninstall.
-TEST_F(ExtensionServiceTest, DISABLED_ClearExtensionData) {
+TEST_F(ExtensionServiceTest, ClearExtensionData) {
InitializeEmptyExtensionService();
ExtensionCookieCallback callback;
@@ -3834,7 +3831,7 @@
}
// Verifies app state is removed upon uninstall.
-TEST_F(ExtensionServiceTest, DISABLED_ClearAppData) {
+TEST_F(ExtensionServiceTest, ClearAppData) {
InitializeEmptyExtensionService();
InitializeRequestContext();
ExtensionCookieCallback callback;
@@ -3964,7 +3961,7 @@
}
// Tests loading single extensions (like --load-extension)
-TEST_F(ExtensionServiceTest, DISABLED_LoadExtension) {
+TEST_F(ExtensionServiceTest, LoadExtension) {
InitializeEmptyExtensionService();
FilePath ext1 = data_dir_
@@ -4004,7 +4001,7 @@
// Tests that we generate IDs when they are not specified in the manifest for
// --load-extension.
-TEST_F(ExtensionServiceTest, DISABLED_GenerateID) {
+TEST_F(ExtensionServiceTest, GenerateID) {
InitializeEmptyExtensionService();
FilePath no_id_ext = data_dir_.AppendASCII("no_id");
@@ -4159,7 +4156,7 @@
// Tests the external installation feature
#if defined(OS_WIN)
-TEST_F(ExtensionServiceTest, DISABLED_ExternalInstallRegistry) {
+TEST_F(ExtensionServiceTest, ExternalInstallRegistry) {
// This should all work, even when normal extension installation is disabled.
InitializeEmptyExtensionService();
set_extensions_enabled(false);
@@ -4172,7 +4169,7 @@
}
#endif
-TEST_F(ExtensionServiceTest, DISABLED_ExternalInstallPref) {
+TEST_F(ExtensionServiceTest, ExternalInstallPref) {
InitializeEmptyExtensionService();
// Now add providers. Extension system takes ownership of the objects.
@@ -4183,7 +4180,7 @@
TestExternalProvider(pref_provider, Extension::EXTERNAL_PREF);
}
-TEST_F(ExtensionServiceTest, DISABLED_ExternalInstallPrefUpdateUrl) {
+TEST_F(ExtensionServiceTest, ExternalInstallPrefUpdateUrl) {
// This should all work, even when normal extension installation is disabled.
InitializeEmptyExtensionService();
set_extensions_enabled(false);
@@ -4202,7 +4199,7 @@
TestExternalProvider(pref_provider, Extension::EXTERNAL_PREF_DOWNLOAD);
}
-TEST_F(ExtensionServiceTest, DISABLED_ExternalInstallPolicyUpdateUrl) {
+TEST_F(ExtensionServiceTest, ExternalInstallPolicyUpdateUrl) {
// This should all work, even when normal extension installation is disabled.
InitializeEmptyExtensionService();
set_extensions_enabled(false);
@@ -4223,7 +4220,7 @@
// Tests that external extensions get uninstalled when the external extension
// providers can't account for them.
-TEST_F(ExtensionServiceTest, DISABLED_ExternalUninstall) {
+TEST_F(ExtensionServiceTest, ExternalUninstall) {
// Start the extensions service with one external extension already installed.
FilePath source_install_dir = data_dir_
.AppendASCII("good")
@@ -4252,7 +4249,7 @@
// Test that running multiple update checks simultaneously does not
// keep the update from succeeding.
-TEST_F(ExtensionServiceTest, DISABLED_MultipleExternalUpdateCheck) {
+TEST_F(ExtensionServiceTest, MultipleExternalUpdateCheck) {
InitializeEmptyExtensionService();
MockExtensionProvider* provider =
@@ -4325,7 +4322,7 @@
};
}
-TEST_F(ExtensionServiceTest, DISABLED_ExternalPrefProvider) {
+TEST_F(ExtensionServiceTest, ExternalPrefProvider) {
InitializeEmptyExtensionService();
// Test some valid extension records.
@@ -4471,7 +4468,7 @@
}
// Test loading good extensions from the profile directory.
-TEST_F(ExtensionServiceTest, DISABLED_LoadAndRelocalizeExtensions) {
+TEST_F(ExtensionServiceTest, LoadAndRelocalizeExtensions) {
// Ensure we're testing in "en" and leave global state untouched.
extension_l10n_util::ScopedLocaleForTest testLocale("en");
@@ -4615,7 +4612,7 @@
}
// Test loading extensions that require limited and unlimited storage quotas.
-TEST_F(ExtensionServiceTest, DISABLED_StorageQuota) {
+TEST_F(ExtensionServiceTest, StorageQuota) {
InitializeEmptyExtensionService();
FilePath extensions_path = data_dir_
@@ -4650,7 +4647,7 @@
}
// Tests ComponentLoader::Add().
-TEST_F(ExtensionServiceTest, DISABLED_ComponentExtensions) {
+TEST_F(ExtensionServiceTest, ComponentExtensions) {
InitializeEmptyExtensionService();
// Component extensions should work even when extensions are disabled.
@@ -4698,7 +4695,7 @@
};
}
-TEST_F(ExtensionServiceTest, DISABLED_GetSyncData) {
+TEST_F(ExtensionServiceTest, GetSyncData) {
InitializeEmptyExtensionService();
InstallCRX(data_dir_.AppendASCII("good.crx"), INSTALL_NEW);
const Extension* extension = service_->GetInstalledExtension(good_crx);
@@ -4721,7 +4718,7 @@
EXPECT_EQ(extension->name(), data.name());
}
-TEST_F(ExtensionServiceTest, DISABLED_GetSyncDataTerminated) {
+TEST_F(ExtensionServiceTest, GetSyncDataTerminated) {
InitializeEmptyExtensionService();
InstallCRX(data_dir_.AppendASCII("good.crx"), INSTALL_NEW);
TerminateExtension(good_crx);
@@ -4746,7 +4743,7 @@
EXPECT_EQ(extension->name(), data.name());
}
-TEST_F(ExtensionServiceTest, DISABLED_GetSyncDataFilter) {
+TEST_F(ExtensionServiceTest, GetSyncDataFilter) {
InitializeEmptyExtensionService();
InstallCRX(data_dir_.AppendASCII("good.crx"), INSTALL_NEW);
const Extension* extension = service_->GetInstalledExtension(good_crx);
@@ -4761,7 +4758,7 @@
ASSERT_EQ(list.size(), 0U);
}
-TEST_F(ExtensionServiceTest, DISABLED_GetSyncExtensionDataUserSettings) {
+TEST_F(ExtensionServiceTest, GetSyncExtensionDataUserSettings) {
InitializeEmptyExtensionService();
InstallCRX(data_dir_.AppendASCII("good.crx"), INSTALL_NEW);
const Extension* extension = service_->GetInstalledExtension(good_crx);
@@ -4809,7 +4806,7 @@
}
}
-TEST_F(ExtensionServiceTest, DISABLED_SyncForUninstalledExternalExtension) {
+TEST_F(ExtensionServiceTest, SyncForUninstalledExternalExtension) {
InitializeEmptyExtensionService();
InstallCRXWithLocation(data_dir_.AppendASCII("good.crx"),
Extension::EXTERNAL_PREF, INSTALL_NEW);
@@ -4845,7 +4842,7 @@
EXPECT_TRUE(service_->IsExternalExtensionUninstalled(good_crx));
}
-TEST_F(ExtensionServiceTest, DISABLED_GetSyncAppDataUserSettings) {
+TEST_F(ExtensionServiceTest, GetSyncAppDataUserSettings) {
InitializeEmptyExtensionService();
const Extension* app =
PackAndInstallCRX(data_dir_.AppendASCII("app"), INSTALL_NEW);
@@ -4890,7 +4887,7 @@
}
}
-TEST_F(ExtensionServiceTest, DISABLED_GetSyncAppDataUserSettingsOnExtensionMoved) {
+TEST_F(ExtensionServiceTest, GetSyncAppDataUserSettingsOnExtensionMoved) {
InitializeEmptyExtensionService();
const size_t kAppCount = 3;
const Extension* apps[kAppCount];
@@ -4933,7 +4930,7 @@
}
}
-TEST_F(ExtensionServiceTest, DISABLED_GetSyncDataList) {
+TEST_F(ExtensionServiceTest, GetSyncDataList) {
InitializeEmptyExtensionService();
InstallCRX(data_dir_.AppendASCII("good.crx"), INSTALL_NEW);
InstallCRX(data_dir_.AppendASCII("page_action.crx"), INSTALL_NEW);
@@ -4956,7 +4953,7 @@
EXPECT_EQ(2u, service_->GetAllSyncData(syncer::EXTENSIONS).size());
}
-TEST_F(ExtensionServiceTest, DISABLED_ProcessSyncDataUninstall) {
+TEST_F(ExtensionServiceTest, ProcessSyncDataUninstall) {
InitializeEmptyExtensionService();
TestSyncProcessorStub processor;
service_->MergeDataAndStartSyncing(
@@ -4994,7 +4991,7 @@
EXPECT_FALSE(service_->GetExtensionById(good_crx, true));
}
-TEST_F(ExtensionServiceTest, DISABLED_ProcessSyncDataWrongType) {
+TEST_F(ExtensionServiceTest, ProcessSyncDataWrongType) {
InitializeEmptyExtensionService();
// Install the extension.
@@ -5041,7 +5038,7 @@
}
}
-TEST_F(ExtensionServiceTest, DISABLED_ProcessSyncDataSettings) {
+TEST_F(ExtensionServiceTest, ProcessSyncDataSettings) {
InitializeEmptyExtensionService();
InitializeExtensionProcessManager();
TestSyncProcessorStub processor;
@@ -5107,7 +5104,7 @@
EXPECT_FALSE(service_->pending_extension_manager()->IsIdPending(good_crx));
}
-TEST_F(ExtensionServiceTest, DISABLED_ProcessSyncDataTerminatedExtension) {
+TEST_F(ExtensionServiceTest, ProcessSyncDataTerminatedExtension) {
InitializeExtensionServiceWithUpdater();
TestSyncProcessorStub processor;
service_->MergeDataAndStartSyncing(
@@ -5142,7 +5139,7 @@
EXPECT_FALSE(service_->pending_extension_manager()->IsIdPending(good_crx));
}
-TEST_F(ExtensionServiceTest, DISABLED_ProcessSyncDataVersionCheck) {
+TEST_F(ExtensionServiceTest, ProcessSyncDataVersionCheck) {
InitializeExtensionServiceWithUpdater();
InitializeRequestContext();
TestSyncProcessorStub processor;
@@ -5210,7 +5207,7 @@
EXPECT_FALSE(service_->pending_extension_manager()->IsIdPending(good_crx));
}
-TEST_F(ExtensionServiceTest, DISABLED_ProcessSyncDataNotInstalled) {
+TEST_F(ExtensionServiceTest, ProcessSyncDataNotInstalled) {
InitializeExtensionServiceWithUpdater();
InitializeRequestContext();
TestSyncProcessorStub processor;
@@ -5252,7 +5249,7 @@
// TODO(akalin): Figure out a way to test |info.ShouldAllowInstall()|.
}
-TEST_F(ExtensionServiceTest, DISABLED_InstallPriorityExternalUpdateUrl) {
+TEST_F(ExtensionServiceTest, InstallPriorityExternalUpdateUrl) {
InitializeEmptyExtensionService();
FilePath path = data_dir_.AppendASCII("good.crx");
@@ -5295,7 +5292,7 @@
EXPECT_FALSE(pending->IsIdPending(kGoodId));
}
-TEST_F(ExtensionServiceTest, DISABLED_InstallPriorityExternalLocalFile) {
+TEST_F(ExtensionServiceTest, InstallPriorityExternalLocalFile) {
Version older_version("0.1.0.0");
Version newer_version("2.0.0.0");
@@ -5452,7 +5449,7 @@
EXPECT_TRUE(pending->IsIdPending(kGoodId));
}
-TEST_F(ExtensionServiceTest, DISABLED_ConcurrentExternalLocalFile) {
+TEST_F(ExtensionServiceTest, ConcurrentExternalLocalFile) {
Version kVersion123("1.2.3");
Version kVersion124("1.2.4");
Version kVersion125("1.2.5");
@@ -5515,7 +5512,7 @@
// This makes sure we can package and install CRX files that use whitelisted
// permissions.
-TEST_F(ExtensionServiceTest, DISABLED_InstallWhitelistedExtension) {
+TEST_F(ExtensionServiceTest, InstallWhitelistedExtension) {
std::string test_id = "hdkklepkcpckhnpgjnmbdfhehckloojk";
CommandLine::ForCurrentProcess()->AppendSwitchASCII(
switches::kWhitelistedExtensionID, test_id);
@@ -5686,7 +5683,7 @@
}
// Test that installing an external extension displays a GlobalError.
-TEST_F(ExtensionServiceTest, DISABLED_ExternalInstallGlobalError) {
+TEST_F(ExtensionServiceTest, ExternalInstallGlobalError) {
FeatureSwitch::ScopedOverride prompt(
FeatureSwitch::prompt_for_external_extensions(), true);
@@ -5733,7 +5730,7 @@
// Test that external extensions are initially disabled, and that enabling
// them clears the prompt.
-TEST_F(ExtensionServiceTest, DISABLED_ExternalInstallInitiallyDisabled) {
+TEST_F(ExtensionServiceTest, ExternalInstallInitiallyDisabled) {
FeatureSwitch::ScopedOverride prompt(
FeatureSwitch::prompt_for_external_extensions(), true);
@@ -5761,7 +5758,7 @@
}
// Test that installing multiple external extensions works.
-TEST_F(ExtensionServiceTest, DISABLED_ExternalInstallMultiple) {
+TEST_F(ExtensionServiceTest, ExternalInstallMultiple) {
FeatureSwitch::ScopedOverride prompt(
FeatureSwitch::prompt_for_external_extensions(), true);
