Fix up DIR_METADATA for supervised_user directories

* Remove spaces from component name
* Do not inherit from multiple COMMON_METADATA files when fields will
  clobber
* Add missing files (e.g.  //components/supervised_user/DIR_METADATA)

Bug: None
Change-Id: Ic19a2513e15b7ee30d92edc264569fa2e0e3f6f0
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4262089
Reviewed-by: Aga Wronska <agawronska@chromium.org>
Owners-Override: Andrew Grieve <agrieve@chromium.org>
Reviewed-by: Nohemi Fernandez <fernandex@chromium.org>
Commit-Queue: Andrew Grieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1108157}

This commit is contained in:

Andrew Grieve

2023-02-22 04:08:38 +00:00

committed by

Chromium LUCI CQ

parent 3494fb6b8d

commit 575ae24366

18 changed files with 31 additions and 47 deletions

chrome

android

java

src

org

chromium

chrome

browser

supervised_user

DIR_METADATA

junit

src

org

chromium

chrome

browser

supervised_user

DIR_METADATA

browser

resources

chromeos

DIR_METADATA

supervision

DIR_METADATA

family_link_user_internals

supervised_user

android

supervised_user

views

supervised_user

DIR_METADATA

webui

family_link_user_internals

DIR_METADATA

renderer

supervised_user

DIR_METADATA

test

data

supervised_user

DIR_METADATA

components

safe_search_api

DIR_METADATA

supervised_user

COMMON_METADATA COMMON_METADATA.chromeos DIR_METADATA

ios/chrome/browser/supervised_user

DIR_METADATA

tools/metrics/histograms/metadata/families

DIR_METADATA

5

chrome/android/java/src/org/chromium/chrome/browser/supervised_user/DIR_METADATA

 @ -1,4 +1 @@
 monorail {
   component: "FamilyExperiences>Browser"
 }
 team_email: "chrome-kids-eng@google.com"
 mixins: "//components/supervised_user/COMMON_METADATA"

1

chrome/android/junit/src/org/chromium/chrome/browser/supervised_user/DIR_METADATA Normal file

				`@ -0,0 +1 @@`
				`mixins: "//components/supervised_user/COMMON_METADATA"`

1

chrome/browser/resources/chromeos/DIR_METADATA Normal file

				`@ -0,0 +1 @@`
				`os: CHROME_OS`

1

chrome/browser/resources/chromeos/supervision/DIR_METADATA Normal file

				`@ -0,0 +1 @@`
				`mixins: "//components/supervised_user/COMMON_METADATA.chromeos"`

6

chrome/browser/resources/family_link_user_internals/DIR_METADATA

 @ -1,4 +1,2 @@
 # Chrome Browser
 mixins: "//chrome/browser/supervised_user/android/COMMON_METADATA"
 # ChromeOS specific
 mixins: "//chrome/browser/supervised_user/chromeos/COMMON_METADATA"
 mixins: "//components/supervised_user/COMMON_METADATA.chromeos"
 mixins: "//components/supervised_user/COMMON_METADATA"

6

chrome/browser/supervised_user/DIR_METADATA

 @ -1,4 +1,2 @@
 # Chrome Browser
 mixins: "//chrome/browser/supervised_user/android/COMMON_METADATA"
 # ChromeOS specific
 mixins: "//chrome/browser/supervised_user/chromeos/COMMON_METADATA"
 mixins: "//components/supervised_user/COMMON_METADATA.chromeos"
 mixins: "//components/supervised_user/COMMON_METADATA"

14

chrome/browser/supervised_user/android/COMMON_METADATA

 @ -1,14 +0,0 @@
 # Metadata information for this directory.
 #
 # For more information on DIR_METADATA files, see:
 #   https://source.chromium.org/chromium/infra/infra/+/HEAD:go/src/infra/tools/dirmd/README.md
 #
 # For the schema of this file, see Metadata message:
 #   https://source.chromium.org/chromium/infra/infra/+/HEAD:go/src/infra/tools/dirmd/proto/dir_metadata.proto
 # Chrome Kids team
 team_email: "chrome-kids-eng@google.com"
 os: ANDROID
 monorail {
   component: "FamilyExperiences > Browser"
 }

1

chrome/browser/ui/supervised_user/DIR_METADATA Normal file

				`@ -0,0 +1 @@`
				`mixins: "//components/supervised_user/COMMON_METADATA.chromeos"`

1

chrome/browser/ui/views/supervised_user/DIR_METADATA Normal file

				`@ -0,0 +1 @@`
				`mixins: "//components/supervised_user/COMMON_METADATA.chromeos"`

6

chrome/browser/ui/webui/family_link_user_internals/DIR_METADATA

 @ -1,4 +1,2 @@
 # Chrome Browser
 mixins: "//chrome/browser/supervised_user/android/COMMON_METADATA"
 # ChromeOS specific
 mixins: "//chrome/browser/supervised_user/chromeos/COMMON_METADATA"
 mixins: "//components/supervised_user/COMMON_METADATA.chromeos"
 mixins: "//components/supervised_user/COMMON_METADATA"

6

chrome/renderer/supervised_user/DIR_METADATA

 @ -1,4 +1,2 @@
 # Chrome Browser
 mixins: "//chrome/browser/supervised_user/android/COMMON_METADATA"
 # ChromeOS specific
 mixins: "//chrome/browser/supervised_user/chromeos/COMMON_METADATA"
 mixins: "//components/supervised_user/COMMON_METADATA.chromeos"
 mixins: "//components/supervised_user/COMMON_METADATA"

1

chrome/test/data/supervised_user/DIR_METADATA Normal file

				`@ -0,0 +1 @@`
				`mixins: "//components/supervised_user/COMMON_METADATA"`

10

components/safe_search_api/DIR_METADATA

 @ -1,7 +1,5 @@
 # Enterprise
 # This first mixin gets clobbered by the second one, but exists
 # for you, the reader, to know that this directory is co-owned by
 # the "Enterprise" component.
 mixins: "//components/policy/COMMON_METADATA"
 # Chrome Browser
 mixins: "//chrome/browser/supervised_user/android/COMMON_METADATA"
 # ChromeOS
 mixins: "//chrome/browser/supervised_user/chromeos/COMMON_METADATA"
 mixins: "//components/supervised_user/COMMON_METADATA.chromeos"

2

components/supervised_user/COMMON_METADATA

 @ -1,5 +1,5 @@
 # Chrome Kids team
 monorail {
   component: "FamilyExperiences > Browser"
   component: "FamilyExperiences>Browser"
 }
 team_email: "chrome-kids-eng@google.com"

8

chrome/browser/supervised_user/chromeos/COMMON_METADATA → components/supervised_user/COMMON_METADATA.chromeos

 @ -8,8 +8,12 @@
 # ChromeOS FamilyExperiences team
 team_email: "cros-families-eng@google.com"
 os: CHROME_OS
 buganizer {
   # ChromeOS > Software > Family > Parental controls
   component_id: 1090157
 }
 }
 # Allow "os" to be inherited from ancestor directory DIR_METADATA so that both
 # COMMON_METADATA.chromeos and COMMON_METADATA can be added as mixins for
 # shared directories.
 # When adding both files, list COMMON_METADATA.chromeos first so that the
 # team_email from the latter one takes precedence (assuming this is desired).

2

components/supervised_user/DIR_METADATA Normal file

 @ -0,0 +1,2 @@
 mixins: "//components/supervised_user/COMMON_METADATA.chromeos"
 mixins: "//components/supervised_user/COMMON_METADATA"

1

ios/chrome/browser/supervised_user/DIR_METADATA Normal file

				`@ -0,0 +1 @@`
				`mixins: "//components/supervised_user/COMMON_METADATA"`

6

tools/metrics/histograms/metadata/families/DIR_METADATA

 @ -1,4 +1,2 @@
 # Chrome Browser
 mixins: "//chrome/browser/supervised_user/android/COMMON_METADATA"
 # ChromeOS specific
 mixins: "//chrome/browser/supervised_user/chromeos/COMMON_METADATA"
 mixins: "//components/supervised_user/COMMON_METADATA.chromeos"
 mixins: "//components/supervised_user/COMMON_METADATA"