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

Unified Diff: chrome/browser/extensions/shared_module_apitest.cc

Issue 459243002: Re-enable shared module tests on windows (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 4 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/shared_module_apitest.cc
diff --git a/chrome/browser/extensions/shared_module_apitest.cc b/chrome/browser/extensions/shared_module_apitest.cc
index d1fb1733441c93fdda82a542970b28886ce19797..dc33302820cc916fcfd0130c31ef8ffb4602a1d8 100644
--- a/chrome/browser/extensions/shared_module_apitest.cc
+++ b/chrome/browser/extensions/shared_module_apitest.cc
@@ -12,13 +12,7 @@ using extensions::Extension;
// it can be imported correctly. We use InstallExtension otherwise so the loads
// happen through the CRX installer which validates imports.
-#if defined(OS_WIN)
-// Timing out on Win7 Tests bot. See http://crbug.com/395796 .
-#define MAYBE_SharedModule DISABLED_SharedModule
-#else
-#define MAYBE_SharedModule SharedModule
-#endif
-IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE_SharedModule) {
+IN_PROC_BROWSER_TEST_F(ExtensionApiTest, SharedModule) {
// import_pass depends on this shared module.
ASSERT_TRUE(LoadExtension(
test_data_dir_.AppendASCII("shared_module").AppendASCII("shared")));
@@ -43,13 +37,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, SharedModuleWhitelist) {
.AppendASCII("import_not_in_whitelist"), 0));
}
-#if defined(OS_WIN)
-// Timing out on Win7 Tests bot. See http://crbug.com/395796 .
-#define MAYBE_SharedModuleInstallEvent DISALBED_SharedModuleInstallEvent
-#else
-#define MAYBE_SharedModuleInstallEvent SharedModuleInstallEvent
-#endif
-IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE_SharedModuleInstallEvent) {
+IN_PROC_BROWSER_TEST_F(ExtensionApiTest, SharedModuleInstallEvent) {
ExtensionTestMessageListener listener1("ready", false);
const Extension* extension = LoadExtension(
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698