Sheriff: Disable NetworkContextConfigurationBrowserTest.CookiesEnabled on Mac OSX

This test (OnDiskApp/NetworkContextConfigurationBrowserTest.CookiesEnabled/1) is
now failing on the Mac10.11 bot:
https://ci.chromium.org/p/chromium/builders/luci.chromium.ci/Mac10.11%20Tests/28580

Noth that the Findit suspects the following CL is failing the test with 86%
confidence:
https://chromium-review.googlesource.com/c/chromium/src/+/1153630
https://findit-for-me.appspot.com/waterfall/failure?url=https://build.chromium.org/p/chromium.mac/builders/Mac10.11%20Tests/builds/28580

At first, I tried to revert it but failed because of merge conflict:
https://chromium-review.googlesource.com/c/chromium/src/+/1175601

Bug: 847555
Change-Id: Idf91c9f8595139dd1d9c667adc304e08d0e6083d
Tbr: mmenke@chromium.org
Reviewed-on: https://chromium-review.googlesource.com/1175585
Commit-Queue: Hiroki Nakagawa <nhiroki@chromium.org>
Reviewed-by: Hiroki Nakagawa <nhiroki@chromium.org>
Cr-Commit-Position: refs/heads/master@{#583189}

chrome/browser/net/network_context_configuration_browsertest.cc

@@ -1213,7 +1213,16 @@ IN_PROC_BROWSER_TEST_P(NetworkContextConfigurationBrowserTest,
   EXPECT_FALSE(GetCookies(embedded_test_server()->base_url()).empty());
 }
 
-IN_PROC_BROWSER_TEST_P(NetworkContextConfigurationBrowserTest, CookiesEnabled) {
+#if defined(OS_MACOSX)
+// Disable the test on Mac OSX since it fails on the bot.
+// (https://crbug.com/847555)
+#define MAYBE_CookiesEnabled DISABLED_CookiesEnabled
+#else
+#define MAYBE_CookiesEnabled CookiesEnabled
+#endif
+
+IN_PROC_BROWSER_TEST_P(NetworkContextConfigurationBrowserTest,
+                       MAYBE_CookiesEnabled) {
   // Check that the cookie from the first stage of the test was / was not
   // preserved between browser restarts, as expected.
   bool has_cookies = !GetCookies(embedded_test_server()->base_url()).empty();