Revert "Re-enable VariationsHttpHeadersBrowserTest tests on ChromeOS."

This reverts commit b050ee2d.

Reason for revert: The test still fails.

Original change's description:
> Re-enable VariationsHttpHeadersBrowserTest tests on ChromeOS.
> 
> I can't reproduce flakes locally, so I'm going to re-enable them and see
> if we've fixed them in the last couple months. I also added additional
> assertions to the test so we'll get more information about why they fail
> if they do.
> 
> Bug: 964338
> Change-Id: I4a864101de6cfb1b434c3b2157d2323d8e6e522a
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1693704
> Reviewed-by: Eric Roman <eroman@chromium.org>
> Commit-Queue: Robbie McElrath <rmcelrath@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#675871}

TBR=eroman@chromium.org,rmcelrath@chromium.org

Change-Id: I22e9da1c789c903fe895cfbf45e47a4971b48c83
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 964338
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1696084Reviewed-by: Robbie McElrath <rmcelrath@chromium.org>
Commit-Queue: Robbie McElrath <rmcelrath@chromium.org>
Cr-Commit-Position: refs/heads/master@{#676061}

chrome/browser/net/variations_http_headers_browsertest.cc

@@ -325,9 +325,17 @@ IN_PROC_BROWSER_TEST_F(VariationsHttpHeadersBrowserTest,
   EXPECT_FALSE(HasReceivedHeader(GetExampleUrl(), "X-Client-Data"));
 }
 
+#if defined(OS_CHROMEOS)
+// See https://crbug.com/964338
+#define MAYBE_TestStrippingHeadersFromRequestUsingSimpleURLLoaderWithProfileNetworkContext \
+  DISABLED_TestStrippingHeadersFromRequestUsingSimpleURLLoaderWithProfileNetworkContext
+#else
+#define MAYBE_TestStrippingHeadersFromRequestUsingSimpleURLLoaderWithProfileNetworkContext \
+  TestStrippingHeadersFromRequestUsingSimpleURLLoaderWithProfileNetworkContext
+#endif
 IN_PROC_BROWSER_TEST_F(
     VariationsHttpHeadersBrowserTest,
-    TestStrippingHeadersFromRequestUsingSimpleURLLoaderWithProfileNetworkContext) {
+    MAYBE_TestStrippingHeadersFromRequestUsingSimpleURLLoaderWithProfileNetworkContext) {
   GURL url = GetGoogleRedirectUrl1();
 
   auto resource_request = std::make_unique<network::ResourceRequest>();
@@ -348,7 +356,6 @@ IN_PROC_BROWSER_TEST_F(
 
   // Wait for the response to complete.
   loader_helper.WaitForCallback();
-  EXPECT_EQ(net::OK, loader->NetError());
   EXPECT_TRUE(loader_helper.response_body());
 
   EXPECT_TRUE(HasReceivedHeader(GetGoogleRedirectUrl1(), "X-Client-Data"));
@@ -357,9 +364,17 @@ IN_PROC_BROWSER_TEST_F(
   EXPECT_FALSE(HasReceivedHeader(GetExampleUrl(), "X-Client-Data"));
 }
 
+#if defined(OS_CHROMEOS)
+// See https://crbug.com/964338
+#define MAYBE_TestStrippingHeadersFromRequestUsingSimpleURLLoaderWithGlobalSystemNetworkContext \
+  DISABLED_TestStrippingHeadersFromRequestUsingSimpleURLLoaderWithGlobalSystemNetworkContext
+#else
+#define MAYBE_TestStrippingHeadersFromRequestUsingSimpleURLLoaderWithGlobalSystemNetworkContext \
+  TestStrippingHeadersFromRequestUsingSimpleURLLoaderWithGlobalSystemNetworkContext
+#endif
 IN_PROC_BROWSER_TEST_F(
     VariationsHttpHeadersBrowserTest,
-    TestStrippingHeadersFromRequestUsingSimpleURLLoaderWithGlobalSystemNetworkContext) {
+    MAYBE_TestStrippingHeadersFromRequestUsingSimpleURLLoaderWithGlobalSystemNetworkContext) {
   GURL url = GetGoogleRedirectUrl1();
 
   auto resource_request = std::make_unique<network::ResourceRequest>();
@@ -380,7 +395,6 @@ IN_PROC_BROWSER_TEST_F(
 
   // Wait for the response to complete.
   loader_helper.WaitForCallback();
-  EXPECT_EQ(net::OK, loader->NetError());
   EXPECT_TRUE(loader_helper.response_body());
 
   EXPECT_TRUE(HasReceivedHeader(GetGoogleRedirectUrl1(), "X-Client-Data"));