Commit c8e48580 authored by Robbie McElrath's avatar Robbie McElrath Committed by Commit Bot

Reenable NetworkContextConfigurationBrowserTests on ChromeOS.

crrev.com/c/1460185 and crrev.com/c/1457478 should have fixed these
tests on ChromeOS.

Bug: 927293
Change-Id: I506f4f5023e431df942797c6820feb7997e514cf
Reviewed-on: https://chromium-review.googlesource.com/c/1460125Reviewed-by: default avatarMatt Menke <mmenke@chromium.org>
Commit-Queue: Robbie McElrath <rmcelrath@chromium.org>
Cr-Commit-Position: refs/heads/master@{#630415}
parent 26b9991a
......@@ -1576,14 +1576,8 @@ class NetworkContextConfigurationProxyOnStartBrowserTest
// Test that when there's a proxy configuration at startup, the initial requests
// use that configuration.
// Flaky on CrOS only. http://crbug.com/922876
#if defined(OS_CHROMEOS)
#define MAYBE_TestInitialProxyConfig DISABLED_TestInitialProxyConfig
#else
#define MAYBE_TestInitialProxyConfig TestInitialProxyConfig
#endif
IN_PROC_BROWSER_TEST_P(NetworkContextConfigurationProxyOnStartBrowserTest,
MAYBE_TestInitialProxyConfig) {
TestInitialProxyConfig) {
if (IsRestartStateWithInProcessNetworkService())
return;
TestProxyConfigured(/*expect_success=*/true);
......@@ -1888,20 +1882,10 @@ IN_PROC_BROWSER_TEST_P(NetworkContextConfigurationHttpsStrippingPacBrowserTest,
// tested, and a suffix of "/0" if the network service is disabled, "/1" if it's
// enabled, and "/2" if it's enabled and restarted.
#if defined(OS_CHROMEOS)
// There's an extra network change event on ChromeOS, likely from
// NetworkChangeNotifierChromeos that makes these tests flaky on ChromeOS when
// there's an out of process network stack.
//
// TODO(https://crbug.com/927293): Fix that, and enable these tests on ChromeOS.
#define TEST_CASES(network_context_type) \
TestCase({NetworkServiceState::kDisabled, network_context_type})
#else // !defined(OS_CHROMEOS)
#define TEST_CASES(network_context_type) \
TestCase({NetworkServiceState::kDisabled, network_context_type}), \
TestCase({NetworkServiceState::kEnabled, network_context_type}), \
TestCase({NetworkServiceState::kRestarted, network_context_type})
#endif // !defined(OS_CHROMEOS)
#if BUILDFLAG(ENABLE_EXTENSIONS)
#define INSTANTIATE_EXTENSION_TESTS(TestFixture) \
......
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