Google Git
Sign in
chromium / chromium / src / 52ab23f8cac96934aea6f8c5207aa78449898f18
commit52ab23f8cac96934aea6f8c5207aa78449898f18[log] [tgz]
authorPavol Marko <pmarko@google.com>Tue Apr 26 22:03:05 2022
committerChromium LUCI CQ <chromium-scoped@luci-project-accounts.iam.gserviceaccount.com>Tue Apr 26 22:03:05 2022
tree83eb8234c2d68e771276fd0724eff8fb43099d2a
parent8d4e65eb56e5fc981d747e531538860d837e5eda [diff]
Replace instead of merging global network configuration

When an ONC GlobalNetworkConfiguration is applied, replace the previous
GlobalNetworkConfiguration instead of merging it.

MergeDictionary was used here since the code was introduced in
https://codereview.chromium.org/23526016 but I'm suspecting it was an
oversight.

Effectively it allows adding/modifying GlobalNetworkConfiguration
entries without a chrome restart, but it does not allow removing entries
without a chrome restart.
See https://chromium.googlesource.com/chromium/src/+/master/components/onc/docs/onc_spec.md#GlobalNetworkConfiguration-type
for possible entries.

If we want such a behavior, we should implement it per setting and not
generally on the input dictionary level IMO.

There was one unittest which relied on the behavior by setting two
policies in a row, changed it.

Bug: b:219568573
Change-Id: I7c3b59b3a8af2d39438e05fa69c9dc2e82af82ff
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3449263
Reviewed-by: Steven Bennetts <stevenjb@chromium.org>
Reviewed-by: Michael Ershov <miersh@google.com>
Reviewed-by: Kyle Horimoto <khorimoto@chromium.org>
Commit-Queue: Pavol Marko <pmarko@chromium.org>
Cr-Commit-Position: refs/heads/main@{#996390}
6 files changed
tree: 83eb8234c2d68e771276fd0724eff8fb43099d2a
  1. android_webview/
  2. apps/
  3. ash/
  4. base/
  5. build/
  6. build_overrides/
  7. buildtools/
  8. cc/
  9. chrome/
  10. chromecast/
  11. chromeos/
  12. codelabs/
  13. components/
  14. content/
  15. courgette/
  16. crypto/
  17. dbus/
  18. device/
  19. docs/
  20. extensions/
  21. fuchsia/
  22. gin/
  23. google_apis/
  24. google_update/
  25. gpu/
  26. headless/
  27. infra/
  28. ios/
  29. ipc/
  30. media/
  31. mojo/
  32. native_client_sdk/
  33. net/
  34. pdf/
  35. ppapi/
  36. printing/
  37. remoting/
  38. rlz/
  39. sandbox/
  40. services/
  41. skia/
  42. sql/
  43. storage/
  44. styleguide/
  45. testing/
  46. third_party/
  47. tools/
  48. ui/
  49. url/
  50. weblayer/
  51. .clang-format
  52. .clang-tidy
  53. .eslintrc.js
  54. .git-blame-ignore-revs
  55. .gitattributes
  56. .gitignore
  57. .gn
  58. .mailmap
  59. .rustfmt.toml
  60. .vpython
  61. .vpython3
  62. .yapfignore
  63. AUTHORS
  64. BUILD.gn
  65. CODE_OF_CONDUCT.md
  66. codereview.settings
  67. DEPS
  68. DIR_METADATA
  69. ENG_REVIEW_OWNERS
  70. LICENSE
  71. LICENSE.chromium_os
  72. OWNERS
  73. PRESUBMIT.py
  74. PRESUBMIT_test.py
  75. PRESUBMIT_test_mocks.py
  76. README.md
  77. WATCHLISTS
README.md

Logo Chromium

Chromium is an open-source browser project that aims to build a safer, faster, and more stable way for all users to experience the web.

The project's web site is https://www.chromium.org.

To check out the source code locally, don't use git clone! Instead, follow the instructions on how to get the code.

Documentation in the source is rooted in docs/README.md.

Learn how to Get Around the Chromium Source Code Directory Structure .

For historical reasons, there are some small top level directories. Now the guidance is that new top level directories are for product (e.g. Chrome, Android WebView, Ash). Even if these products have multiple executables, the code should be in subdirectories of the product.

If you found a bug, please file it at https://crbug.com/new.