| Index: chrome/browser/extensions/api/management/management_api_browsertest.cc
|
| diff --git a/chrome/browser/extensions/api/management/management_api_browsertest.cc b/chrome/browser/extensions/api/management/management_api_browsertest.cc
|
| index f1bed3804a732b304f725c2e4c5046d09f60fa30..fe6ef8b942264d3358888177cabe0ffa59142f19 100644
|
| --- a/chrome/browser/extensions/api/management/management_api_browsertest.cc
|
| +++ b/chrome/browser/extensions/api/management/management_api_browsertest.cc
|
| @@ -233,8 +233,14 @@ class ExtensionManagementApiEscalationTest :
|
| const char ExtensionManagementApiEscalationTest::kId[] =
|
| "pgdpcfcocojkjfbgpiianjngphoopgmo";
|
|
|
| +// Temporarily disabled in official builds. See crbug.com/567497 for details.
|
| +#if defined(GOOGLE_CHROME_BUILD) && defined(OS_WIN)
|
| +#define MAYBE_DisabledReason DISABLED_DisabledReason
|
| +#else
|
| +#define MAYBE_DisabledReason DisabledReason
|
| +#endif // defined(GOOGLE_CHROME_BUILD) && defined(OS_WIN)
|
| IN_PROC_BROWSER_TEST_F(ExtensionManagementApiEscalationTest,
|
| - DisabledReason) {
|
| + MAYBE_DisabledReason) {
|
| scoped_refptr<ManagementGetFunction> function =
|
| new ManagementGetFunction();
|
| scoped_ptr<base::Value> result(util::RunFunctionAndReturnSingleResult(
|
| @@ -250,8 +256,13 @@ IN_PROC_BROWSER_TEST_F(ExtensionManagementApiEscalationTest,
|
| EXPECT_EQ(reason, std::string(keys::kDisabledReasonPermissionsIncrease));
|
| }
|
|
|
| -IN_PROC_BROWSER_TEST_F(ExtensionManagementApiEscalationTest,
|
| - SetEnabled) {
|
| +// Temporarily disabled in official builds. See crbug.com/567497 for details.
|
| +#if defined(GOOGLE_CHROME_BUILD) && defined(OS_WIN)
|
| +#define MAYBE_SetEnabled DISABLED_SetEnabled
|
| +#else
|
| +#define MAYBE_SetEnabled SetEnabled
|
| +#endif // defined(GOOGLE_CHROME_BUILD) && defined(OS_WIN)
|
| +IN_PROC_BROWSER_TEST_F(ExtensionManagementApiEscalationTest, MAYBE_SetEnabled) {
|
| // Expect an error about no gesture.
|
| SetEnabled(true, false, keys::kGestureNeededForEscalationError);
|
|
|
|
|