The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/f76325366bc71ee372c71f10223e086944b89a68

commit f76325366bc71ee372c71f10223e086944b89a68
Author: Robbie McElrath <rmcelrath@chromium.org>
Date: Thu Jan 10 19:22:06 2019

Update some tests to not overwrite existing Features.

Each of these tests uses a ScopedFeatureList to replace the set of
enabled Features with a custom one, typically to force a single Feature
on or off. If you enable/disable some Feature via a flag, or with
another ScopedFeatureList, these tests will reset that Feature's state.
These tests all fail with the network service enabled because of the
network::features::kNetworkService Feature getting reset mid-test.

ScopedFeatureList has initialization methods that update the
existing configuration rather than replacing it. This CL updates tests
to use those other initialization methods.

Bug: 920038
Change-Id: Ic19cedb9e4883d3e7081d32b1a705ba2cc3981c5
Reviewed-on: https://chromium-review.googlesource.com/c/1401456
Reviewed-by: Sergey Ulanov <sergeyu@chromium.org>
Reviewed-by: Scott Violet <sky@chromium.org>
Reviewed-by: Tarun Bansal <tbansal@chromium.org>
Reviewed-by: Timothy Loh <timloh@chromium.org>
Reviewed-by: Ryan Sleevi <rsleevi@chromium.org>
Reviewed-by: mark a. foltz <mfoltz@chromium.org>
Commit-Queue: Robbie McElrath <rmcelrath@chromium.org>
Cr-Commit-Position: refs/heads/master@{#621696}
[modify] https://crrev.com/f76325366bc71ee372c71f10223e086944b89a68/chrome/browser/data_use_measurement/page_load_capping/page_load_capping_browsertest.cc
[modify] https://crrev.com/f76325366bc71ee372c71f10223e086944b89a68/chrome/browser/media/media_engagement_score_unittest.cc
[modify] https://crrev.com/f76325366bc71ee372c71f10223e086944b89a68/chrome/browser/net/netinfo_network_quality_estimator_holdback_browsertest.cc
[modify] https://crrev.com/f76325366bc71ee372c71f10223e086944b89a68/chrome/browser/permissions/permission_context_base_unittest.cc
[modify] https://crrev.com/f76325366bc71ee372c71f10223e086944b89a68/chrome/browser/previews/previews_infobar_delegate_unittest.cc
[modify] https://crrev.com/f76325366bc71ee372c71f10223e086944b89a68/chrome/browser/previews/previews_lite_page_browsertest.cc
[modify] https://crrev.com/f76325366bc71ee372c71f10223e086944b89a68/chrome/browser/ssl/ssl_error_handler_unittest.cc
[modify] https://crrev.com/f76325366bc71ee372c71f10223e086944b89a68/chrome/browser/ui/media_router/media_router_file_dialog_unittest.cc
[modify] https://crrev.com/f76325366bc71ee372c71f10223e086944b89a68/chrome/browser/ui/webui/media_router/media_router_ui_unittest.cc

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/7112246b3dbeebf99659871f89c8e27fbeb7ec4b

commit 7112246b3dbeebf99659871f89c8e27fbeb7ec4b
Author: Robbie McElrath <rmcelrath@chromium.org>
Date: Mon Jan 14 21:23:20 2019

Enable the Network Service by default on ChromeOS.

This enables the network service by default, and disables it at the
beginning of unit tests, since they don't currently work with the
network service enabled.

This will be reverted after a few days, or earlier if it causes
problems. We're only enabling it by default to make sure all test
suites (in particular the hardware autotests) have a chance to run
with it enabled, and to get bug reports from developers.

Bug: 920038
Change-Id: Iff9a2ab08b82d4446e327b685be1bca8cf61917b
Reviewed-on: https://chromium-review.googlesource.com/c/1399297
Reviewed-by: John Abd-El-Malek <jam@chromium.org>
Commit-Queue: Robbie McElrath <rmcelrath@chromium.org>
Cr-Commit-Position: refs/heads/master@{#622606}
[modify] https://crrev.com/7112246b3dbeebf99659871f89c8e27fbeb7ec4b/components/test/DEPS
[modify] https://crrev.com/7112246b3dbeebf99659871f89c8e27fbeb7ec4b/components/test/components_test_suite.cc
[modify] https://crrev.com/7112246b3dbeebf99659871f89c8e27fbeb7ec4b/content/public/test/content_test_suite_base.cc
[modify] https://crrev.com/7112246b3dbeebf99659871f89c8e27fbeb7ec4b/content/public/test/content_test_suite_base.h
[modify] https://crrev.com/7112246b3dbeebf99659871f89c8e27fbeb7ec4b/services/network/public/cpp/features.cc
[modify] https://crrev.com/7112246b3dbeebf99659871f89c8e27fbeb7ec4b/testing/buildbot/chromium.chromiumos.json
[modify] https://crrev.com/7112246b3dbeebf99659871f89c8e27fbeb7ec4b/testing/buildbot/chromium.memory.json
[modify] https://crrev.com/7112246b3dbeebf99659871f89c8e27fbeb7ec4b/testing/buildbot/test_suites.pyl

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/4dfaf6c9c14919c7409d95058dd5dbb13f9457ba

commit 4dfaf6c9c14919c7409d95058dd5dbb13f9457ba
Author: Robbie McElrath <rmcelrath@chromium.org>
Date: Tue Jan 15 05:21:13 2019

Revert "Enable the Network Service by default on ChromeOS."

This reverts commit 7112246b3dbeebf99659871f89c8e27fbeb7ec4b.

Reason for revert: Possibly caused  crbug.com/921814 

Original change's description:
> Enable the Network Service by default on ChromeOS.
> 
> This enables the network service by default, and disables it at the
> beginning of unit tests, since they don't currently work with the
> network service enabled.
> 
> This will be reverted after a few days, or earlier if it causes
> problems. We're only enabling it by default to make sure all test
> suites (in particular the hardware autotests) have a chance to run
> with it enabled, and to get bug reports from developers.
> 
> Bug: 920038
> Change-Id: Iff9a2ab08b82d4446e327b685be1bca8cf61917b
> Reviewed-on: https://chromium-review.googlesource.com/c/1399297
> Reviewed-by: John Abd-El-Malek <jam@chromium.org>
> Commit-Queue: Robbie McElrath <rmcelrath@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#622606}

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

Change-Id: I0403f965966a8d658c94cfbc8856424179b0b0d8
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 920038
Reviewed-on: https://chromium-review.googlesource.com/c/1411072
Reviewed-by: Robbie McElrath <rmcelrath@chromium.org>
Commit-Queue: Robbie McElrath <rmcelrath@chromium.org>
Cr-Commit-Position: refs/heads/master@{#622740}
[modify] https://crrev.com/4dfaf6c9c14919c7409d95058dd5dbb13f9457ba/components/test/DEPS
[modify] https://crrev.com/4dfaf6c9c14919c7409d95058dd5dbb13f9457ba/components/test/components_test_suite.cc
[modify] https://crrev.com/4dfaf6c9c14919c7409d95058dd5dbb13f9457ba/content/public/test/content_test_suite_base.cc
[modify] https://crrev.com/4dfaf6c9c14919c7409d95058dd5dbb13f9457ba/content/public/test/content_test_suite_base.h
[modify] https://crrev.com/4dfaf6c9c14919c7409d95058dd5dbb13f9457ba/services/network/public/cpp/features.cc
[modify] https://crrev.com/4dfaf6c9c14919c7409d95058dd5dbb13f9457ba/testing/buildbot/chromium.chromiumos.json
[modify] https://crrev.com/4dfaf6c9c14919c7409d95058dd5dbb13f9457ba/testing/buildbot/chromium.memory.json
[modify] https://crrev.com/4dfaf6c9c14919c7409d95058dd5dbb13f9457ba/testing/buildbot/test_suites.pyl