Re-enable ExtensionApiTest.SharedModule* for non-windows builds

BUG=395796

Review URL: https://codereview.chromium.org/415233002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@285404 0039d316-1c4b-4281-b951-d872f2087c98
parent 07436dcb
...@@ -12,8 +12,13 @@ using extensions::Extension; ...@@ -12,8 +12,13 @@ using extensions::Extension;
// it can be imported correctly. We use InstallExtension otherwise so the loads // it can be imported correctly. We use InstallExtension otherwise so the loads
// happen through the CRX installer which validates imports. // happen through the CRX installer which validates imports.
#if defined(OS_WIN)
// Timing out on Win7 Tests bot. See http://crbug.com/395796 . // Timing out on Win7 Tests bot. See http://crbug.com/395796 .
IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DISABLED_SharedModule) { #define MAYBE_SharedModule DISABLED_SharedModule
#else
#define MAYBE_SharedModule SharedModule
#endif
IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE_SharedModule) {
// import_pass depends on this shared module. // import_pass depends on this shared module.
ASSERT_TRUE(LoadExtension( ASSERT_TRUE(LoadExtension(
test_data_dir_.AppendASCII("shared_module").AppendASCII("shared"))); test_data_dir_.AppendASCII("shared_module").AppendASCII("shared")));
...@@ -38,8 +43,13 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, SharedModuleWhitelist) { ...@@ -38,8 +43,13 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, SharedModuleWhitelist) {
.AppendASCII("import_not_in_whitelist"), 0)); .AppendASCII("import_not_in_whitelist"), 0));
} }
#if defined(OS_WIN)
// Timing out on Win7 Tests bot. See http://crbug.com/395796 . // Timing out on Win7 Tests bot. See http://crbug.com/395796 .
IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DISABLED_SharedModuleInstallEvent) { #define MAYBE_SharedModuleInstallEvent DISALBED_SharedModuleInstallEvent
#else
#define MAYBE_SharedModuleInstallEvent SharedModuleInstallEvent
#endif
IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE_SharedModuleInstallEvent) {
ExtensionTestMessageListener listener1("ready", false); ExtensionTestMessageListener listener1("ready", false);
const Extension* extension = LoadExtension( const Extension* extension = LoadExtension(
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment