tools/metrics/histograms/histograms.xml

Index: tools/metrics/histograms/histograms.xml
diff --git a/tools/metrics/histograms/histograms.xml b/tools/metrics/histograms/histograms.xml
index bbbfeab5e9166b580d7d130e8a11fdb19ea97b27..d54bea7ff392dd4a3eb3fac05a7cdbaccc15ea50 100644
--- a/tools/metrics/histograms/histograms.xml
+++ b/tools/metrics/histograms/histograms.xml
@@ -53068,6 +53068,33 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   </summary>
 </histogram>
 
+<histogram name="SupervisedUserContentProvider.ChromeNotStartedRequestTime"
+    units="ms">
+  <owner>aberent@chromium.org</owner>
+  <summary>
+    Time to get the response to requesting whether a URL should be accessible to
+    the supervised user, when Chrome was not previously running.
+  </summary>
+</histogram>
+
+<histogram name="SupervisedUserContentProvider.ChromeStartedRequestTime"
+    units="ms">
+  <owner>aberent@chromium.org</owner>
+  <summary>
+    Time to get the response to requesting whether a URL should be accessible to
+    the supervised user, when Chrome was already running.
+  </summary>
+</histogram>
+
+<histogram name="SupervisedUserContentProvider.RequestTimedOut"
+    enum="BooleanTimedOut">
+  <owner>aberent@chromium.org</owner>
+  <summary>
+    True if a request to find out whether a URL should be accessible to a
+    supervised user timed out.
+  </summary>
+</histogram>
+
 <histogram name="Sync.AppAssociationTime" units="ms">
   <owner>zea@chromium.org</owner>
   <summary>
@@ -68377,7 +68404,8 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   <int value="14" label="Enable Safe Browsing"/>
   <int value="15" label="Enable reporting of usage and crash-related data"/>
   <int value="16" label="Enable saving passwords to the password manager"/>
-  <int value="17" label="Allow users to show passwords in Password Manager"/>
+  <int value="17"
+      label="Allow users to show passwords in Password Manager (deprecated)"/>
   <int value="18" label="Enable AutoFill"/>
   <int value="19" label="Specify a list of disabled plugins"/>
   <int value="20" label="Disable synchronization of data with Google"/>
@@ -68774,19 +68802,21 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   <int value="318" label="Configure ARC"/>
   <int value="319"
       label="Allow the auto launched with zero delay kiosk app to control
-             ChromeOS version"/>

[Bernhard Bauer, 2016/05/19 10:00:15]

Merge conflict?

[aberent, 2016/05/19 15:44:03]

Fixed by local rebase.

[aberent, 2016/05/19 17:22:13]

Actually maybe not, I need to investigate what is actually going on here.

+             Google Chrome OS version"/>
   <int value="320" label="Control use of the Web Bluetooth API"/>
   <int value="321" label="Configure the login authentication behavior"/>
   <int value="322" label="Whitelist of USB detachable devices"/>
   <int value="323" label="Allow bluetooth on device"/>
   <int value="324" label="Suppress the unsupported OS warning"/>
-  <int value="325" label="Enable queries to Quirks Server"/>
+  <int value="325"
+      label="Enable queries to Quirks Server for hardware profiles"/>
   <int value="326" label="Configure the automatic timezone detection method"/>
   <int value="327" label="Enable ending processes in Task Manager"/>
   <int value="328"
       label="URLs that will be granted access to video capture devices on
              SAML login pages"/>
   <int value="329" label="Permit locking the screen"/>
+  <int value="330" label="Set an external source of URL restrictions"/>
 </enum>
 
 <enum name="EnterprisePolicyInvalidations" type="int">