| Index: chrome/browser/extensions/extension_management_browsertest.cc
|
| ===================================================================
|
| --- chrome/browser/extensions/extension_management_browsertest.cc (revision 134463)
|
| +++ chrome/browser/extensions/extension_management_browsertest.cc (working copy)
|
| @@ -222,6 +222,7 @@
|
| // Fails consistently on Windows XP, see: http://crbug.com/120640.
|
| #define MAYBE_AutoUpdate DISABLED_AutoUpdate
|
| #else
|
| +// See http://crbug.com/103371 and http://crbug.com/120640.
|
| #if defined(ADDRESS_SANITIZER)
|
| #define MAYBE_AutoUpdate DISABLED_AutoUpdate
|
| #else
|
| @@ -300,8 +301,12 @@
|
| // Fails consistently on Windows XP, see: http://crbug.com/120640.
|
| #define MAYBE_AutoUpdateDisabledExtensions DISABLED_AutoUpdateDisabledExtensions
|
| #else
|
| +#if defined(ADDRESS_SANITIZER)
|
| +#define MAYBE_AutoUpdateDisabledExtensions DISABLED_AutoUpdateDisabledExtensions
|
| +#else
|
| #define MAYBE_AutoUpdateDisabledExtensions AutoUpdateDisabledExtensions
|
| #endif
|
| +#endif
|
|
|
| // Tests extension autoupdate.
|
| IN_PROC_BROWSER_TEST_F(ExtensionManagementTest,
|
| @@ -511,7 +516,15 @@
|
| EXPECT_FALSE(service->GetExtensionById(kExtensionId, true));
|
| }
|
|
|
| -IN_PROC_BROWSER_TEST_F(ExtensionManagementTest, PolicyOverridesUserInstall) {
|
| +// See http://crbug.com/103371 and http://crbug.com/120640.
|
| +#if defined(ADDRESS_SANITIZER)
|
| +#define MAYBE_PolicyOverridesUserInstall DISABLED_PolicyOverridesUserInstall
|
| +#else
|
| +#define MAYBE_PolicyOverridesUserInstall PolicyOverridesUserInstall
|
| +#endif
|
| +
|
| +IN_PROC_BROWSER_TEST_F(ExtensionManagementTest,
|
| + MAYBE_PolicyOverridesUserInstall) {
|
| ExtensionService* service = browser()->profile()->GetExtensionService();
|
| const char* kExtensionId = "ogjcoiohnmldgjemafoockdghcjciccf";
|
| service->updater()->set_blacklist_checks_enabled(false);
|
|
|