Upstream version 9.37.195.0
[platform/framework/web/crosswalk.git] / src / tools / metrics / histograms / histograms.xml
index 09fb842..cf3e4f5 100644 (file)
@@ -20,20 +20,23 @@ three sections:
   and optionally a more detailed description.
 * The enums section defines and documents the enumerated types referred to by
   the histograms.
-* The fieldtrials section defines active field trials and their groups, along
-  with their descriptions.
+* The histogram_suffixes section provides a compact way of defining histograms
+  by applying affixes to existing histograms. This could be done recursively
+  and the max recursion depth is 5. See the example below for details on how it
+  works.
 
-Each field trial lists the histograms that it affects. The complete list of
-histograms is computed by appending the field trial group names to each of
-the affected histograms. For example, define the following:
+Each histogram_suffixes tag lists the histograms that it affects. The complete
+list of histograms is computed by appending (or prepending - see below) the
+histogram_suffixes suffix names to each of the affected histograms. For example,
+define the following:
 
   <histogram name="FileLoadLatency"/>
 
-  <fieldtrial name="SuperHttpExperiment">
-    <group name="SuperHttpEnabled"/>
-    <group name="SuperHttpDisabled"/>
+  <histogram_suffixes name="SuperHttpExperiment">
+    <suffix name="SuperHttpEnabled"/>
+    <suffix name="SuperHttpDisabled"/>
     <affected-histogram name="FileLoadLatency"/>
-  </fieldtrial>
+  </histogram_suffixes>
 
 The complete list of histograms will be:
 
@@ -41,12 +44,23 @@ The complete list of histograms will be:
   FileLoadLatency_SuperHttpEnabled
   FileLoadLatency_SuperHttpDisabled
 
-Field trial definitions can currently be used in any situation where multiple
-suffixes need to be appended to a histogram name; they do not have to
-correspond to actual field trials in the Chrome source code.
+histogram_suffixes can also be used to insert affix in the middle. Example:
 
-TODO(mlloyd): Refactor the XML so that field trials can be distinguished from
-other types of suffix sets.
+  <histogram name="Prerender.Events"/>
+
+  <histogram_suffixes name="SuperHttpExperiment" ordering="prefix">
+    <suffix name="HoverStats50"/>
+    <affected-histogram name="Prerender.Events"/>
+  </histogram_suffixes>
+
+The complete list of histograms will be:
+
+  Prerender.Events
+  Prerender.HoverStats50_Events
+
+When 'ordering="prefix"' is present in the histogram_suffixes tag, the suffix
+will be inserted after the first dot separator of the affected-histogram name.
+Therefore, the affected-histogram name has to have at least one dot in it.
 -->
 
 <histogram-configuration>
@@ -454,6 +468,14 @@ other types of suffix sets.
   </summary>
 </histogram>
 
+<histogram name="Apps.AppListWarmupDuration" units="milliseconds">
+  <owner>tapted@chromium.org</owner>
+  <summary>
+    The amount of time spent in warmup (in WarmupForProfile call). This will
+    tell us how long warmup blocks the UI.
+  </summary>
+</histogram>
+
 <histogram name="Ash.ActiveTouchPoints">
   <owner>kuscher@google.com</owner>
   <owner>rbyers@chromium.org</owner>
@@ -660,7 +682,59 @@ other types of suffix sets.
   </summary>
 </histogram>
 
+<histogram name="Ash.TouchView.TouchViewActive" units="milliseconds">
+  <owner>girard@chromium.org</owner>
+  <summary>
+    The length of time that TouchView is active, for each activation.
+  </summary>
+</histogram>
+
+<histogram name="Ash.TouchView.TouchViewActivePercentage" units="%">
+  <owner>girard@chromium.org</owner>
+  <summary>The proportion of time spent in TouchView during a session.</summary>
+</histogram>
+
+<histogram name="Ash.TouchView.TouchViewActiveTotal" units="seconds">
+  <owner>girard@chromium.org</owner>
+  <summary>The total time that TouchView is active during a session.</summary>
+</histogram>
+
+<histogram name="Ash.TouchView.TouchViewInactive" units="milliseconds">
+  <owner>girard@chromium.org</owner>
+  <summary>The length of time between TouchView activations.</summary>
+</histogram>
+
+<histogram name="Ash.TouchView.TouchViewInactiveTotal" units="seconds">
+  <owner>girard@chromium.org</owner>
+  <summary>
+    The total time that TouchView is not active during a session.
+  </summary>
+</histogram>
+
+<histogram name="Ash.WindowCycleController.CycleTime" units="milliseconds">
+  <owner>flackr@chromium.org</owner>
+  <owner>kuscher@google.com</owner>
+  <summary>
+    The amount of time the Alt key is held after pressing Alt+Tab to begin
+    cycling through windows.
+  </summary>
+</histogram>
+
+<histogram name="Ash.WindowSelector.ArrowKeyPresses">
+  <owner>flackr@chromium.org</owner>
+  <owner>tdanderson@chromium.org</owner>
+  <summary>
+    The number of times the arrow keys are pressed in overview mode per session,
+    i.e. between bringing up overview mode and ending it. This is only measured
+    for the sessions that end by selecting a window with the enter key.
+  </summary>
+</histogram>
+
 <histogram name="Ash.WindowSelector.CycleTime" units="milliseconds">
+  <obsolete>
+    Deprecated as of 06/2014. No longer relevant since alt-tab switching was
+    separated from WindowSelector.
+  </obsolete>
   <owner>flackr@chromium.org</owner>
   <owner>kuscher@google.com</owner>
   <summary>
@@ -674,8 +748,24 @@ other types of suffix sets.
   <owner>kuscher@google.com</owner>
   <summary>
     The number of items (single windows or groups of windows such as panels) in
-    the window selection. Window selection occurs when a user begins alt-tabbing
-    or presses the overview button (F5 key).
+    the overview mode, present at the start of each session.
+  </summary>
+</histogram>
+
+<histogram name="Ash.WindowSelector.KeyPressesOverItemsRatio" units="%">
+  <owner>flackr@chromium.org</owner>
+  <owner>tdanderson@chromium.org</owner>
+  <summary>
+    The ratio between the arrow key presses and the number of overview items,
+    expressed as a percentage for a single session.
+  </summary>
+</histogram>
+
+<histogram name="Ash.WindowSelector.OverviewClosedItems">
+  <owner>flackr@chromium.org</owner>
+  <owner>tdanderson@chromium.org</owner>
+  <summary>
+    The number of items closed from the window overview for a single session.
   </summary>
 </histogram>
 
@@ -683,9 +773,7 @@ other types of suffix sets.
   <owner>flackr@chromium.org</owner>
   <owner>kuscher@google.com</owner>
   <summary>
-    The amount of time between uses of window selection to switch between
-    windows. Window selection is entered by alt-tabbing or by pressing the
-    overview button (F5 key).
+    The amount of time between uses of overview mode to switch between windows.
   </summary>
 </histogram>
 
@@ -693,11 +781,10 @@ other types of suffix sets.
   <owner>flackr@chromium.org</owner>
   <owner>kuscher@google.com</owner>
   <summary>
-    The amount of time spent in overview mode. Overview mode is engaged when
-    lingering on a window while alt-tabbing or by pressing the overview button.
-    The time is measured from the moment the windows begin animating to a
-    thumbnail size preview to when a window is selected or selection is
-    canceled.
+    The amount of time spent in overview mode. Overview mode is engaged by
+    pressing the overview button. The time is measured from the moment the
+    windows begin animating to a thumbnail size preview to when a window is
+    selected or selection is canceled.
   </summary>
 </histogram>
 
@@ -1487,6 +1574,16 @@ other types of suffix sets.
   </summary>
 </histogram>
 
+<histogram name="Autofill.AddressBook.AccessSkipped" enum="BooleanSkipped">
+  <owner>erikchen@chromium.org</owner>
+  <summary>
+    Whether an attempt to access the Mac AddressBook was skipped because doing
+    so would incorrectly cause the appearance of the permissions dialog. This
+    happens when Chrome auto-update changes the binary on disk before the first
+    AddressBook access attempt.
+  </summary>
+</histogram>
+
 <histogram name="Autofill.AddressBookAvailable" enum="BooleanAvailable">
   <owner>isherman@chromium.org</owner>
   <summary>
@@ -1588,6 +1685,21 @@ other types of suffix sets.
   <summary>Tracks whether Autofill is enabled when Chrome launches.</summary>
 </histogram>
 
+<histogram name="Autofill.MacAddressBook" enum="AutofillMacAddressBook">
+  <owner>erikchen@chromium.org</owner>
+  <summary>
+    When Chrome tries to access the user's Address Book, OSX presents a blocking
+    dialog which disrupts the user experience. A new Chrome feature has been
+    introduced wherein Chrome only shows this blocking dialog if the user
+    explicitly asked Chrome to access the user's Address Book. If a form's field
+    looks like it might support Autofill suggestions from the user's Address
+    Book and there are no other suggestions, Chrome shows an Autofill entry that
+    prompts the user to give Chrome access to the user's Address Book. This
+    histogram tracks the frequency that this Autofill entry is presented, and
+    the frequency that this Autofill entry is selected.
+  </summary>
+</histogram>
+
 <histogram name="AutoFill.ProfileCount">
   <obsolete>
     Deprecated as of 3/2011, replaced by Autofill.StoredProfileCount.
@@ -1727,6 +1839,13 @@ other types of suffix sets.
   </summary>
 </histogram>
 
+<histogram name="BatteryStatus.StartAndroid" enum="BooleanSuccess">
+  <owner>timvolodine@chromium.org</owner>
+  <summary>
+    Whether the Battery Status API was successfully started up on Android.
+  </summary>
+</histogram>
+
 <histogram name="Blacklist.Blocked" enum="DllHash">
   <owner>csharp@chromium.org</owner>
   <summary>
@@ -1743,16 +1862,51 @@ other types of suffix sets.
   </summary>
 </histogram>
 
+<histogram name="Blacklist.RetryAttempts.Success">
+  <owner>csharp@chromium.org</owner>
+  <owner>krstnmnlsn@chromium.org</owner>
+  <summary>
+    Records the number of attempts needed before the blacklist is properly set
+    up. This is logged immediately after a successful setup.
+  </summary>
+</histogram>
+
 <histogram name="Blacklist.Setup" enum="BlacklistSetup">
   <owner>csharp@chromium.org</owner>
   <summary>
     Records the successes and failures when running the browser blacklist setup
     code. Used to determine if the blacklist is working as intended during
-    startup(since the blacklist runs before crash reporting is set up).  This
+    startup (since the blacklist runs before crash reporting is set up). This
     only occurs on Windows.
   </summary>
 </histogram>
 
+<histogram name="BlinkGC.CollectGarbage" units="milliseconds">
+  <owner>haraken@chromium.org</owner>
+  <summary>Duration of time taken to run Heap::collectGarbage().</summary>
+</histogram>
+
+<histogram name="BlinkGC.PerformPendingSweep" units="milliseconds">
+  <owner>haraken@chromium.org</owner>
+  <summary>
+    Duration of time taken to run ThreadState::performPendingSweep().
+  </summary>
+</histogram>
+
+<histogram name="BlinkGC.TotalAllocatedSpace" units="KB">
+  <owner>haraken@chromium.org</owner>
+  <summary>
+    The total size of allocated space in OS when a Blink GC is triggered.
+  </summary>
+</histogram>
+
+<histogram name="BlinkGC.TotalObjectSpace" units="KB">
+  <owner>haraken@chromium.org</owner>
+  <summary>
+    The total size of object space in all threads when a Blink GC is triggered.
+  </summary>
+</histogram>
+
 <histogram name="Bluetooth.ConnectedDeviceCount" units="devices">
   <owner>keybuk@chromium.org</owner>
   <summary>
@@ -1846,6 +2000,15 @@ other types of suffix sets.
   </summary>
 </histogram>
 
+<histogram name="CaptivePortal.OOBE.PortalToOnlineTransition"
+    units="milliseconds">
+  <owner>ygorshenin@chromium.org</owner>
+  <summary>
+    Number of milliseconds passed between consecutive reports for the same
+    network about portal and online states.
+  </summary>
+</histogram>
+
 <histogram name="CaptivePortal.Session.DetectionDuration" units="milliseconds">
   <owner>ygorshenin@chromium.org</owner>
   <summary>
@@ -1876,6 +2039,15 @@ other types of suffix sets.
   </summary>
 </histogram>
 
+<histogram name="CaptivePortal.Session.PortalToOnlineTransition"
+    units="milliseconds">
+  <owner>ygorshenin@chromium.org</owner>
+  <summary>
+    Number of milliseconds passed between consecutive reports for the same
+    network about portal and online states.
+  </summary>
+</histogram>
+
 <histogram name="Cast.Sender.CastButtonShown" enum="BooleanEnabled">
   <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
   <summary>
@@ -1904,8 +2076,21 @@ other types of suffix sets.
   <summary>Records the media type of every video being cast.</summary>
 </histogram>
 
+<histogram name="Cast.Sender.CastPlayerResult" enum="CastPlayBackState">
+  <owner>maybelle@chromium.org</owner>
+  <owner>miguelg@chromium.org</owner>
+  <summary>
+    Records the result of a request to play remotely on a per player app basis
+    within Chrome for Android.
+  </summary>
+</histogram>
+
 <histogram name="Cast.Sender.CastPlaySuccess" enum="BooleanSuccess">
-  <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
+  <obsolete>
+    Deprecated 04/2014, and replaced by Cast.Sender.CastPlayerResult.
+  </obsolete>
+  <owner>maybelle@chromium.org</owner>
+  <owner>miguelg@chromium.org</owner>
   <summary>
     Records the result of a request to play remotely. The value will be true if
     the playback succeeded, and false if there was an error.
@@ -2006,6 +2191,148 @@ other types of suffix sets.
   </summary>
 </histogram>
 
+<histogram name="ChildProcess.BadMessgeTerminated" enum="ProcessType2">
+  <owner>jam@chromium.org</owner>
+  <summary>
+    Count of child processes killed because they sent an IPC that couldn't be
+    deserialized..
+  </summary>
+</histogram>
+
+<histogram name="ChildProcess.Crashed" enum="ProcessType">
+  <obsolete>
+    Deprecated 3/2013. Renamed to ChildProcess.Crashed2.
+  </obsolete>
+  <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
+  <summary>Count of child process crashes grouped by process type.</summary>
+</histogram>
+
+<histogram name="ChildProcess.Crashed2" enum="ProcessType2">
+  <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
+  <summary>Count of child process crashes grouped by process type.</summary>
+</histogram>
+
+<histogram name="ChildProcess.CrashedWasAlive" enum="ProcessType">
+  <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
+  <summary>
+    Count of child process crashes that we miscounted because we took the exit
+    code too early. Grouped by process type.
+  </summary>
+</histogram>
+
+<histogram name="ChildProcess.Crashes" enum="ProcessType">
+  <obsolete>
+    Deprecated 10/2011. Renamed to ChildProcess.Crashed.
+  </obsolete>
+  <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
+  <summary>Count of child process crashes grouped by process type.</summary>
+</histogram>
+
+<histogram name="ChildProcess.CrashesWasAlive" enum="ProcessType">
+  <obsolete>
+    Deprecated 10/2011. Renamed to ChildProcess.CrashedWasAlive.
+  </obsolete>
+  <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
+  <summary>
+    Count of child process crashes that we miscounted because we took the exit
+    code too early. Grouped by process type.
+  </summary>
+</histogram>
+
+<histogram name="ChildProcess.DefaultCase" enum="ProcessType">
+  <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
+  <summary>
+    Count of child process crashes for which we were not able to understand the
+    exit code, grouped by process type.
+  </summary>
+</histogram>
+
+<histogram name="ChildProcess.Disconnected" enum="ProcessType">
+  <obsolete>
+    Deprecated 3/2013. Renamed to ChildProcess.Disconnected2.
+  </obsolete>
+  <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
+  <summary>
+    Count of child process abnormal channel disconnects grouped by process type.
+  </summary>
+</histogram>
+
+<histogram name="ChildProcess.Disconnected2" enum="ProcessType2">
+  <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
+  <summary>
+    Count of child process abnormal channel disconnects grouped by process type.
+  </summary>
+</histogram>
+
+<histogram name="ChildProcess.DisconnectedAlive" enum="ProcessType">
+  <obsolete>
+    Deprecated 3/2013. Renamed to ChildProcess.DisconnectedAlive2.
+  </obsolete>
+  <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
+  <summary>
+    Count of child process abnormal channel disconnects that are not classified
+    and reported because we took the exit code too early. Grouped by process
+    type.
+  </summary>
+</histogram>
+
+<histogram name="ChildProcess.DisconnectedAlive2" enum="ProcessType2">
+  <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
+  <summary>
+    Count of child process abnormal channel disconnects that are not classified
+    and reported because we took the exit code too early. Grouped by process
+    type.
+  </summary>
+</histogram>
+
+<histogram name="ChildProcess.Killed" enum="ProcessType">
+  <obsolete>
+    Deprecated 3/2013. Renamed to ChildProcess.Killed2.
+  </obsolete>
+  <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
+  <summary>Count of child process kills grouped by process type.</summary>
+</histogram>
+
+<histogram name="ChildProcess.Killed2" enum="ProcessType2">
+  <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
+  <summary>Count of child process kills grouped by process type.</summary>
+</histogram>
+
+<histogram name="ChildProcess.KilledByExtensionAPI">
+  <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
+  <summary>
+    Count of child processes killed by the extension API
+    (experimental.processes.terminate)
+  </summary>
+</histogram>
+
+<histogram name="ChildProcess.KilledWasAlive" enum="ProcessType">
+  <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
+  <summary>
+    Count of child process kills that we miscounted because we took the exit
+    code too early. Grouped by process type.
+  </summary>
+</histogram>
+
+<histogram name="ChildProcess.Kills" enum="ProcessType">
+  <obsolete>
+    Deprecated 10/2011. Renamed to ChildProcess.Killed.
+  </obsolete>
+  <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
+  <summary>Count of child process kills grouped by process type.</summary>
+</histogram>
+
+<histogram name="ChildProcess.KillsWasAlive" enum="ProcessType">
+  <obsolete>
+    Deprecated 10/2011. Renamed to ChildProcess.KilledWasAlive.
+  </obsolete>
+  <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
+  <summary>
+    Count of child process kills that we miscounted because we took the exit
+    code too early. Grouped by process type.
+  </summary>
+</histogram>
+
 <histogram name="Chrome.Android.Activity.CrashCounts" enum="AndroidActivityId">
   <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
   <summary>
@@ -2236,6 +2563,14 @@ other types of suffix sets.
   </summary>
 </histogram>
 
+<histogram name="Clipboard.X11StoreCopyPasteDuration" units="ms">
+  <owner>pkotwicz@chromium.org</owner>
+  <summary>
+    The length of time that it takes to transfer ownership of Chrome's CLIPBOARD
+    selection to the clipboard manager when Chrome exits.
+  </summary>
+</histogram>
+
 <histogram name="CloudPrint.AuthEvent" enum="CloudPrintAuthEventType">
   <owner>vitalybuka@chromium.org</owner>
   <summary>Event counts in CloudPrintAuth.</summary>
@@ -2378,9 +2713,7 @@ other types of suffix sets.
 
 <histogram name="CloudPrint.XmppPingTry">
   <owner>vitalybuka@chromium.org</owner>
-  <summary>
-    Number of tries before successfull ping. 99 means giving up.
-  </summary>
+  <summary>Number of tries before successful ping. 99 means giving up.</summary>
 </histogram>
 
 <histogram name="Compositing.CopyFromSurfaceTime" units="ms">
@@ -2523,6 +2856,16 @@ other types of suffix sets.
   </summary>
 </histogram>
 
+<histogram name="Cras.StreamTimeoutMilliSeconds" units="milliseconds">
+  <owner>hychao@chromium.org</owner>
+  <summary>
+    The longest additional time CRAS(Chrome OS audio server) ever waits for a
+    stream exceeding the timeout threshold. This value is recorded per stream
+    when it gets removed and used to investigate the audio glitch/skip problem
+    on Chrome OS.
+  </summary>
+</histogram>
+
 <histogram name="Cros.ClickOnShelf" enum="CrosShelfClickTarget">
   <obsolete>
     Deprecated as of 12/2013. Default pinned apps trial is finished.
@@ -2614,6 +2957,26 @@ other types of suffix sets.
   </summary>
 </histogram>
 
+<histogram name="DataReductionProxy.BypassOnNetworkErrorFallback"
+    enum="NetErrorCodes">
+  <owner>bengr@chromium.org</owner>
+  <summary>
+    Positive net error code that caused the fallback data reduction proxy to be
+    bypassed and put on the proxy retry list. Called after a failure to connect
+    or resolve a host name.
+  </summary>
+</histogram>
+
+<histogram name="DataReductionProxy.BypassOnNetworkErrorPrimary"
+    enum="NetErrorCodes">
+  <owner>bengr@chromium.org</owner>
+  <summary>
+    Positive net error code that caused the primary data reduction proxy to be
+    bypassed and put on the proxy retry list. Called after a failure to connect
+    or resolve a host name.
+  </summary>
+</histogram>
+
 <histogram name="DataReductionProxy.ProbeURL"
     enum="DataReductionProxyProbeURLFetchResult">
   <owner>bengr@chromium.org</owner>
@@ -3158,6 +3521,11 @@ other types of suffix sets.
   <summary>The age of the cache's files (wall time). ShaderCache.</summary>
 </histogram>
 
+<histogram name="DiskCache.SizeStats2" units="kilobytes">
+  <owner>rvargas@chromium.org</owner>
+  <summary>The size distribution of data stored in the HTTP cache.</summary>
+</histogram>
+
 <histogram name="DiskCache.TotalIOTime" units="milliseconds">
   <obsolete>
     Deprecated.
@@ -3919,6 +4287,69 @@ other types of suffix sets.
   </summary>
 </histogram>
 
+<histogram name="DomainReliability.AddBeaconDidEvict" enum="BooleanDidEvict">
+  <owner>ttuttle@chromium.org</owner>
+  <summary>
+    Whether adding a beacon to a Domain Reliability context caused it to evict
+    an older beacon to stay within memory limits.
+  </summary>
+</histogram>
+
+<histogram name="DomainReliability.BeaconReported" enum="BooleanReported">
+  <owner>ttuttle@chromium.org</owner>
+  <summary>
+    Whether a beacon added to a Domain Reliability context was saved to be
+    uploaded to the collector.
+  </summary>
+</histogram>
+
+<histogram name="DomainReliability.ReportedBeaconError" enum="NetErrorCodes">
+  <owner>ttuttle@chromium.org</owner>
+  <summary>
+    The Chrome error code included in a beacon saved to be uploaded to the
+    collector.
+  </summary>
+</histogram>
+
+<histogram name="DomainReliability.UploadDuration" units="ms">
+  <owner>ttuttle@chromium.org</owner>
+  <summary>
+    The elapsed time between starting and finishing a Domain Reliability upload.
+  </summary>
+</histogram>
+
+<histogram name="DomainReliability.UploadFailover"
+    enum="DomainReliability.BooleanFailover">
+  <owner>ttuttle@chromium.org</owner>
+  <summary>
+    Whether a Domain Reliability upload was sent to a collector other than the
+    first one listed in the config. (This only happens when an upload to the
+    first collector fails.)
+  </summary>
+</histogram>
+
+<histogram name="DomainReliability.UploadInterval" units="ms">
+  <owner>ttuttle@chromium.org</owner>
+  <summary>
+    The time between successive Domain Reliability uploads being started in the
+    same context. (Can be arbitrarily long if no beacons are reported in a
+    while.)
+  </summary>
+</histogram>
+
+<histogram name="DomainReliability.UploadResponseCode">
+  <owner>ttuttle@chromium.org</owner>
+  <summary>
+    The response code returned by the Domain Reliability collector when a report
+    is uploaded.
+  </summary>
+</histogram>
+
+<histogram name="DomainReliability.UploadSuccess" enum="BooleanSuccess">
+  <owner>ttuttle@chromium.org</owner>
+  <summary>Whether a Domain Reliability upload succeeded.</summary>
+</histogram>
+
 <histogram name="DomDistiller.DistillationQuality" enum="BooleanSuccess">
   <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
   <summary>
@@ -4619,6 +5050,49 @@ other types of suffix sets.
   </summary>
 </histogram>
 
+<histogram name="EasyUnlock.ClickedButton" enum="EasyUnlockButton">
+  <owner>joshwoodward@google.com</owner>
+  <owner>tbarzic@chromium.org</owner>
+  <summary>Button clicked in EasyUnlock app during setup process.</summary>
+</histogram>
+
+<histogram name="EasyUnlock.NotificationEvent"
+    enum="EasyUnlockNotificationEvent">
+  <owner>joshwoodward@google.com</owner>
+  <owner>tbarzic@chromium.org</owner>
+  <summary>
+    Tracks events related to notifications used by EasyUnlock feature. For
+    example a specific EasyUnlock notification being shown or clicked.
+  </summary>
+</histogram>
+
+<histogram name="EasyUnlock.SetupStateOnClose" enum="EasyUnlockSetupState">
+  <owner>joshwoodward@google.com</owner>
+  <owner>tbarzic@chromium.org</owner>
+  <summary>
+    The state of EasyUnlock setup when the app window was closed by user.
+  </summary>
+</histogram>
+
+<histogram name="EasyUnlock.StartupTimeFromSuspend" units="milliseconds">
+  <owner>joshwoodward@google.com</owner>
+  <owner>tengs@chromium.org</owner>
+  <summary>
+    The time it takes after resuming from a suspended state (ie. opening the
+    Chromebook lid) to when a remote device is connected and a request is made.
+    Note that it is possible for the remote device not to be present when
+    resuming from suspend, and the device may be connected at a later time.
+    Therefore, large values for this metric may not be too meaningful due to
+    meddling users.
+  </summary>
+</histogram>
+
+<histogram name="EasyUnlock.UnlockEvent" enum="EasyUnlockUnlockEvent">
+  <owner>joshwoodward@google.com</owner>
+  <owner>tbarzic@chromium.org</owner>
+  <summary>Screen unlock events detected while EasyUnlock was enabled.</summary>
+</histogram>
+
 <histogram name="Enterprise.AutoEnrollmentExtraTime" units="milliseconds">
   <owner>joaodasilva@chromium.org</owner>
   <summary>
@@ -4654,6 +5128,16 @@ other types of suffix sets.
   </summary>
 </histogram>
 
+<histogram name="Enterprise.EnrolledPolicyHasDMToken" enum="Boolean">
+  <owner>tnagel@chromium.org</owner>
+  <summary>
+    Whether loading of device policy from file on an enterprise-enrolled
+    (checked against install_attributes.pb) Chrome OS device yields an
+    enterprise policy with a DM token.  Filled once during session startup,
+    after first successful device policy read.
+  </summary>
+</histogram>
+
 <histogram name="Enterprise.Enrollment" enum="EnterpriseEnrollmentType">
   <owner>joaodasilva@chromium.org</owner>
   <summary>
@@ -4661,6 +5145,19 @@ other types of suffix sets.
   </summary>
 </histogram>
 
+<histogram name="Enterprise.EnrollmentRecovery" enum="EnterpriseEnrollmentType">
+  <owner>tnagel@chromium.org</owner>
+  <summary>Events related to Chrome OS enterprise enrollment recovery.</summary>
+</histogram>
+
+<histogram name="Enterprise.IOSPolicies">
+  <owner>joaodasilva@chromium.org</owner>
+  <summary>
+    Number of policies loaded at startup on iOS, and when a change is detected
+    at runtime.
+  </summary>
+</histogram>
+
 <histogram name="Enterprise.ONC.PolicyValidation" enum="BooleanSuccess">
   <owner>joaodasilva@chromium.org</owner>
   <summary>Result of the OpenNetworkConfiguration policy validation.</summary>
@@ -4794,7 +5291,7 @@ other types of suffix sets.
   <owner>pastarmovj@chromium.org</owner>
   <summary>
     Whether we were able to contact the AD Domain Controller. This check is
-    performed once at start-up.
+    performed once at start-up on Windows.
   </summary>
 </histogram>
 
@@ -4803,7 +5300,7 @@ other types of suffix sets.
   <owner>pastarmovj@chromium.org</owner>
   <summary>
     Enum of possible things that can fail while checking for enterprise env.
-    This check is performed once at start-up.
+    This check is performed once at start-up on Windows.
   </summary>
 </histogram>
 
@@ -4812,7 +5309,7 @@ other types of suffix sets.
   <owner>pastarmovj@chromium.org</owner>
   <summary>
     Whether the machine is part of an AD domain. This check is performed once at
-    start-up.
+    start-up on Windows.
   </summary>
 </histogram>
 
@@ -4821,9 +5318,9 @@ other types of suffix sets.
   <owner>joaodasilva@chromium.org</owner>
   <owner>pastarmovj@chromium.org</owner>
   <summary>
-    The number of disabled policy entries due to integrity violations while
-    parsing the policy data which happens on start-up and when the policy has
-    changed.
+    The number of disabled policy entries on Windows due to integrity violations
+    while parsing the policy data which happens on start-up and when the policy
+    has changed.
   </summary>
 </histogram>
 
@@ -4832,7 +5329,7 @@ other types of suffix sets.
   <owner>pastarmovj@chromium.org</owner>
   <summary>
     The rough Windows suite we are runnnig on. This check is performed once at
-    start-up.
+    start-up on Windows.
   </summary>
 </histogram>
 
@@ -5198,8 +5695,12 @@ other types of suffix sets.
 <histogram name="Event.Latency.Renderer2" units="microseconds">
   <owner>rbyers@chromium.org</owner>
   <summary>
-    Time between initiation of the input event and the renderer receiving and
-    starting to process it.
+    Time between input event creation and the renderer receiving and starting to
+    process the event. For touch events on Windows, we measure from when the
+    event reaches Chrome, whereas on other platforms we use the timestamp from
+    the kernel. On Windows, this metric is only reported when
+    |IsHighResNowFastAndReliable| is true, which will introduce some sampling
+    bias.
   </summary>
 </histogram>
 
@@ -5218,9 +5719,12 @@ other types of suffix sets.
     units="microseconds">
   <owner>rbyers@chromium.org</owner>
   <summary>
-    Time between initial creation of touch event and when the resulting
-    ScrollGesture reaches Impl thread. Maximum is 1000ms. This supersedes the
-    Event.Latency.RendererImpl.GestureScroll metric.
+    Time between touch event creation and when the resulting GestureScroll
+    reaches the Impl thread. Maximum is 1000ms. On Windows, we measure from when
+    the touch event reaches Chrome, whereas on other platforms we use the
+    timestamp from the kernel. On Windows, this metric is only reported when
+    |IsHighResNowFastAndReliable| is true, which will introduce some sampling
+    bias. This supersedes the Event.Latency.RendererImpl.GestureScroll metric.
   </summary>
 </histogram>
 
@@ -5242,6 +5746,48 @@ other types of suffix sets.
   </summary>
 </histogram>
 
+<histogram name="ExtensionActivity.AdInjected" units="Extension Count">
+  <owner>felt@chromium.org</owner>
+  <owner>rdevlin.cronin@chromium.org</owner>
+  <summary>
+    For each pageload, the number of extensions that inject at least one new ad.
+  </summary>
+</histogram>
+
+<histogram name="ExtensionActivity.AdLikelyInjected" units="Extension Count">
+  <owner>felt@chromium.org</owner>
+  <owner>rdevlin.cronin@chromium.org</owner>
+  <summary>
+    For each pageload, the number of extensions that performed an action that
+    heuristically looks like injecting an ad, but could not be confirmed.
+  </summary>
+</histogram>
+
+<histogram name="ExtensionActivity.AdLikelyReplaced" units="Extension Count">
+  <owner>felt@chromium.org</owner>
+  <owner>rdevlin.cronin@chromium.org</owner>
+  <summary>
+    For each pageload, the number of extensions that performed an action that
+    heuristically looks like replacing an ad, but could not be confirmed.
+  </summary>
+</histogram>
+
+<histogram name="ExtensionActivity.AdRemoved" units="Extension Count">
+  <owner>felt@chromium.org</owner>
+  <owner>rdevlin.cronin@chromium.org</owner>
+  <summary>
+    For each pageload, the number of extensions that remove at least one ad.
+  </summary>
+</histogram>
+
+<histogram name="ExtensionActivity.AdReplaced" units="Extension Count">
+  <owner>felt@chromium.org</owner>
+  <owner>rdevlin.cronin@chromium.org</owner>
+  <summary>
+    For each pageload, the number of extensions that replace at least one ad.
+  </summary>
+</histogram>
+
 <histogram name="ExtensionActivity.ContentScript">
   <owner>felt@chromium.org</owner>
   <summary>
@@ -5485,6 +6031,44 @@ other types of suffix sets.
   </summary>
 </histogram>
 
+<histogram name="ExtensionBubble.DevModeUserSelection"
+    enum="ExtensionBubbleAction">
+  <owner>finnur@chromium.org</owner>
+  <summary>
+    The action taken by the user when seeing the bubble, logged right after the
+    action is taken.
+  </summary>
+</histogram>
+
+<histogram name="ExtensionBubble.ExtensionsInDevModeCount"
+    units="Developer Mode Extensions">
+  <owner>finnur@chromium.org</owner>
+  <summary>
+    The total number of extensions found to be loaded under Developer Mode,
+    logged when the devmode bubble is shown (once per startup per profile, if
+    any devmode extension is found).
+  </summary>
+</histogram>
+
+<histogram name="ExtensionBubble.ExtensionWipeoutCount" units="Extensions">
+  <owner>finnur@chromium.org</owner>
+  <summary>
+    The total number of extensions found to be wiped by SideloadWipeout, logged
+    when the wipeout bubble is shown, which is once per startup per profile (as
+    long as wiped extensions were found). Not logged if no extensions of that
+    nature were found.
+  </summary>
+</histogram>
+
+<histogram name="ExtensionBubble.WipeoutUserSelection"
+    enum="ExtensionBubbleAction">
+  <owner>finnur@chromium.org</owner>
+  <summary>
+    The action taken by the user when seeing the bubble, logged right after the
+    action is taken.
+  </summary>
+</histogram>
+
 <histogram name="ExtensionInstalledLoader.ForceDisabled"
     enum="BooleanForceDisabled">
   <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
@@ -5531,7 +6115,7 @@ other types of suffix sets.
 
 <histogram name="ExtensionInstallVerifier.ActualStatus"
     enum="ExtensionInstallVerifierStatus">
-  <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
+  <owner>asargent@chromium.org</owner>
   <summary>
     Logged during InstallVerifier::Init, to indicate the actual enforcement
     status used (usually determined by the ExtensionInstallVerifier field trial
@@ -5541,7 +6125,7 @@ other types of suffix sets.
 
 <histogram name="ExtensionInstallVerifier.ExperimentStatus"
     enum="ExtensionInstallVerifierStatus">
-  <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
+  <owner>asargent@chromium.org</owner>
   <summary>
     Logged during InstallVerifier::Init to indicate the enforcement status as
     determined by the ExtensionInstallVerifier field trial experiment.
@@ -5550,13 +6134,13 @@ other types of suffix sets.
 
 <histogram name="ExtensionInstallVerifier.GetSignatureResult"
     enum="ExtensionInstallVerifierGetSignatureResult">
-  <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
+  <owner>asargent@chromium.org</owner>
   <summary>The result of the verifier trying to get a new signature.</summary>
 </histogram>
 
 <histogram name="ExtensionInstallVerifier.InitResult"
     enum="ExtensionInstallVerifierInitResult">
-  <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
+  <owner>asargent@chromium.org</owner>
   <summary>
     The result of initialization for the extension install verifier.
   </summary>
@@ -5564,12 +6148,121 @@ other types of suffix sets.
 
 <histogram name="ExtensionInstallVerifier.MustRemainDisabled"
     enum="ExtensionInstallVerifierMustRemainDisabled">
-  <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
+  <owner>asargent@chromium.org</owner>
   <summary>
     The outcome for each call to InstallVerifier::MustRemainDisabled.
   </summary>
 </histogram>
 
+<histogram name="ExtensionOverrideBubble.NtpOverriddenUserSelection"
+    enum="ExtensionBubbleAction">
+  <owner>finnur@chromium.org</owner>
+  <summary>
+    The action taken by the user when seeing the bubble, notifing them of an
+    extension overriding their new tab page. Logged right after the action is
+    taken.
+  </summary>
+</histogram>
+
+<histogram name="ExtensionOverrideBubble.SettingsApiUserSelectionHomePage"
+    enum="ExtensionBubbleAction">
+  <owner>finnur@chromium.org</owner>
+  <summary>
+    The action taken by the user when seeing the bubble, notifing them of an
+    extension overriding their homepage. Logged right after the action is taken.
+  </summary>
+</histogram>
+
+<histogram name="ExtensionOverrideBubble.SettingsApiUserSelectionSearchEngine"
+    enum="ExtensionBubbleAction">
+  <owner>finnur@chromium.org</owner>
+  <summary>
+    The action taken by the user when seeing the bubble, notifing them of an
+    extension overriding their search engine. Logged right after the action is
+    taken.
+  </summary>
+</histogram>
+
+<histogram name="ExtensionOverrideBubble.SettingsApiUserSelectionStartupPage"
+    enum="ExtensionBubbleAction">
+  <owner>finnur@chromium.org</owner>
+  <summary>
+    The action taken by the user when seeing the bubble, notifing them of an
+    extension overriding their startup page. Logged right after the action is
+    taken.
+  </summary>
+</histogram>
+
+<histogram name="Extensions.ActiveScriptController.DeniedExtensions"
+    units="Extension Count">
+  <owner>kalman@chromium.org</owner>
+  <owner>rdevlin.cronin@chromium.org</owner>
+  <summary>
+    The number of extensions on a page that wanted to execute a script, required
+    explicit user consent, and were denied permission.
+  </summary>
+</histogram>
+
+<histogram name="Extensions.ActiveScriptController.PermittedExtensions"
+    units="Extension Count">
+  <owner>kalman@chromium.org</owner>
+  <owner>rdevlin.cronin@chromium.org</owner>
+  <summary>
+    The number of extensions on a page that wanted to execute a script, required
+    explicit user consent, and were granted permission.
+  </summary>
+</histogram>
+
+<histogram name="Extensions.ActiveScriptController.PreventableAdInjectors"
+    units="Extension Count">
+  <owner>kalman@chromium.org</owner>
+  <owner>rdevlin.cronin@chromium.org</owner>
+  <summary>
+    The number of extensions per page that injected an ad and could have been
+    stopped if the user had declined script injection. This is related to the
+    ActivityLog metrics, ExtensionActivity.Ad*. Recorded upon page close or
+    navigation. Only recorded if there was at least one ad injection detected.
+  </summary>
+</histogram>
+
+<histogram name="Extensions.ActiveScriptController.ShownActiveScriptsOnPage"
+    units="Number of Actions">
+  <owner>kalman@chromium.org</owner>
+  <owner>rdevlin.cronin@chromium.org</owner>
+  <summary>
+    The number of extensions which would display an Active Script Running
+    indiciation to the user. Recorded at page close.
+  </summary>
+</histogram>
+
+<histogram name="Extensions.ActiveScriptController.UnpreventableAdInjectors"
+    units="Extension Count">
+  <owner>kalman@chromium.org</owner>
+  <owner>rdevlin.cronin@chromium.org</owner>
+  <summary>
+    The number of extensions per page that injected an ad and that could not
+    have been stopped through script injection permission. This is related to
+    the ActivityLog metrics, ExtensionActivity.Ad*. Recorded upon page close or
+    navigation. Only recorded if there was at least one ad injection detected.
+  </summary>
+</histogram>
+
+<histogram name="Extensions.AdInjection.AdType" enum="InjectedAdType">
+  <owner>felt@chromium.org</owner>
+  <owner>rdevlin.cronin@chromium.org</owner>
+  <summary>The type of ad that was injected.</summary>
+</histogram>
+
+<histogram name="Extensions.AdInjection.InstallLocation"
+    enum="ExtensionLocation">
+  <owner>felt@chromium.org</owner>
+  <owner>rdevlin.cronin@chromium.org</owner>
+  <summary>
+    The install location of an ad-injecting extension. Recorded upon page close
+    for any extension that injected ads on that page.
+  </summary>
+</histogram>
+
 <histogram name="Extensions.AllocatePortIdPairOverflow">
   <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
   <summary>
@@ -5725,6 +6418,15 @@ other types of suffix sets.
   </summary>
 </histogram>
 
+<histogram name="Extensions.DisabledUIUserResponseRemoteInstall"
+    enum="ExtensionDisabledUIUserResponse">
+  <owner>mek@chromium.org</owner>
+  <summary>
+    User response to the dialog shown when an extension is disabled due to it
+    having been installed remotely.
+  </summary>
+</histogram>
+
 <histogram name="Extensions.ErrorCodeFromCrxOpen">
   <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
   <summary>
@@ -5823,6 +6525,30 @@ other types of suffix sets.
   </summary>
 </histogram>
 
+<histogram name="Extensions.FileAccessAllowed">
+  <owner>kalman@chromium.org</owner>
+  <summary>
+    The number of extensions (and friends) that could have been given access to
+    the file:// scheme, and were, for users that have at least one extension
+    that could have been given access. This excludes anything that doesn't show
+    up in chrome://extensions (platform apps, hosted apps, component
+    extensions), policy-installed extensions, and unpacked extensions. See also
+    Extensions.FileAccessNotAllowed.
+  </summary>
+</histogram>
+
+<histogram name="Extensions.FileAccessNotAllowed">
+  <owner>kalman@chromium.org</owner>
+  <summary>
+    The number of extensions (and friends) that could have been given access to
+    the file:// scheme, but weren't, for users that have at least one extension
+    that could have been given access. This excludes anything that doesn't show
+    up in chrome://extensions (platform apps, hosted apps, component
+    extensions), policy-installed extensions, and unpacked extensions. See also
+    Extensions.FileAccessAllowed.
+  </summary>
+</histogram>
+
 <histogram name="Extensions.FromWebstoreInconsistency"
     enum="ExtensionFromWebstoreInconcistencyEnum">
   <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
@@ -5846,6 +6572,30 @@ other types of suffix sets.
   </summary>
 </histogram>
 
+<histogram name="Extensions.IncognitoAllowed">
+  <owner>kalman@chromium.org</owner>
+  <summary>
+    The number of extensions (and friends) that could have been allowed in
+    incognito, and were, for users that have at least one extension that could
+    have been allowed. This excludes anything that doesn't show up in
+    chrome://extensions (platform apps, hosted apps, component extensions),
+    policy-installed extensions, and unpacked extensions. See also
+    Extensions.IncognitoNotAllowed.
+  </summary>
+</histogram>
+
+<histogram name="Extensions.IncognitoNotAllowed">
+  <owner>kalman@chromium.org</owner>
+  <summary>
+    The number of extensions (and friends) that could have been allowed in
+    incognito, but weren't, for users that have at least one extension that
+    could have been allowed. This excludes anything that doesn't show up in
+    chrome://extensions (platform apps, hosted apps, component extensions),
+    policy-installed extensions, and unpacked extensions. See also
+    Extensions.IncognitoAllowed.
+  </summary>
+</histogram>
+
 <histogram name="Extensions.InjectCssTime" units="milliseconds">
   <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
   <summary>
@@ -5988,6 +6738,14 @@ other types of suffix sets.
   </summary>
 </histogram>
 
+<histogram name="Extensions.LoadCreationFlags" enum="ExtensionCreationFlags">
+  <owner>calamity@chromium.org</owner>
+  <summary>
+    The creation flags of all extensions loaded at startup time grouped by
+    Extension::InitFromValueFlags.
+  </summary>
+</histogram>
+
 <histogram name="Extensions.LoadExtension">
   <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
   <summary>The number of extensions loaded at browser startup.</summary>
@@ -6117,6 +6875,11 @@ other types of suffix sets.
   </summary>
 </histogram>
 
+<histogram name="Extensions.ManifestVersion">
+  <owner>kalman@chromium.org</owner>
+  <summary>The manifest version of each loaded extension.</summary>
+</histogram>
+
 <histogram name="Extensions.NetworkDelay" units="milliseconds">
   <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
   <summary>Time that network requests were blocked due to extensions.</summary>
@@ -6154,7 +6917,21 @@ other types of suffix sets.
 </histogram>
 
 <histogram name="Extensions.Permissions_AutoDisable" enum="ExtensionPermission">
-  <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
+  <obsolete>
+    Deprecated as of 5/2014, replaced by Extensions.Permissions_AutoDisable2.
+  </obsolete>
+  <owner>kalman@chromium.org</owner>
+  <owner>rpaquay@chromium.org</owner>
+  <summary>
+    The permissions present in an extension when it is automatically disabled
+    due to a permission increase (e.g., after an extension upgrade).
+  </summary>
+</histogram>
+
+<histogram name="Extensions.Permissions_AutoDisable2"
+    enum="ExtensionPermission2">
+  <owner>kalman@chromium.org</owner>
+  <owner>rpaquay@chromium.org</owner>
   <summary>
     The permissions present in an extension when it is automatically disabled
     due to a permission increase (e.g., after an extension upgrade).
@@ -6162,7 +6939,19 @@ other types of suffix sets.
 </histogram>
 
 <histogram name="Extensions.Permissions_Install" enum="ExtensionPermission">
-  <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
+  <obsolete>
+    Deprecated as of 5/2014, replaced by Extensions.Permissions_Install2.
+  </obsolete>
+  <owner>kalman@chromium.org</owner>
+  <owner>rpaquay@chromium.org</owner>
+  <summary>
+    The permissions present in an extension when it was installed.
+  </summary>
+</histogram>
+
+<histogram name="Extensions.Permissions_Install2" enum="ExtensionPermission2">
+  <owner>kalman@chromium.org</owner>
+  <owner>rpaquay@chromium.org</owner>
   <summary>
     The permissions present in an extension when it was installed.
   </summary>
@@ -6170,7 +6959,21 @@ other types of suffix sets.
 
 <histogram name="Extensions.Permissions_InstallAbort"
     enum="ExtensionPermission">
-  <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
+  <obsolete>
+    Deprecated as of 5/2014, replaced by Extensions.Permissions_InstallAbort2.
+  </obsolete>
+  <owner>kalman@chromium.org</owner>
+  <owner>rpaquay@chromium.org</owner>
+  <summary>
+    The permissions present in an extension when installation was aborted, not
+    including installation errors and user cancels.
+  </summary>
+</histogram>
+
+<histogram name="Extensions.Permissions_InstallAbort2"
+    enum="ExtensionPermission2">
+  <owner>kalman@chromium.org</owner>
+  <owner>rpaquay@chromium.org</owner>
   <summary>
     The permissions present in an extension when installation was aborted, not
     including installation errors and user cancels.
@@ -6179,19 +6982,55 @@ other types of suffix sets.
 
 <histogram name="Extensions.Permissions_InstallCancel"
     enum="ExtensionPermission">
-  <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
+  <obsolete>
+    Deprecated as of 5/2014, replaced by Extensions.Permissions_InstallCancel2.
+  </obsolete>
+  <owner>kalman@chromium.org</owner>
+  <owner>rpaquay@chromium.org</owner>
+  <summary>
+    The permissions present in an extension when installation was canceled.
+  </summary>
+</histogram>
+
+<histogram name="Extensions.Permissions_InstallCancel2"
+    enum="ExtensionPermission2">
+  <owner>kalman@chromium.org</owner>
+  <owner>rpaquay@chromium.org</owner>
   <summary>
     The permissions present in an extension when installation was canceled.
   </summary>
 </histogram>
 
 <histogram name="Extensions.Permissions_Load" enum="ExtensionPermission">
-  <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
+  <obsolete>
+    Deprecated as of 5/2014, replaced by Extensions.Permissions_Load2.
+  </obsolete>
+  <owner>kalman@chromium.org</owner>
+  <owner>rpaquay@chromium.org</owner>
+  <summary>The permissions present in an extension when it was loaded.</summary>
+</histogram>
+
+<histogram name="Extensions.Permissions_Load2" enum="ExtensionPermission2">
+  <owner>kalman@chromium.org</owner>
+  <owner>rpaquay@chromium.org</owner>
   <summary>The permissions present in an extension when it was loaded.</summary>
 </histogram>
 
 <histogram name="Extensions.Permissions_ReEnable" enum="ExtensionPermission">
-  <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
+  <obsolete>
+    Deprecated as of 5/2014, replaced by Extensions.Permissions_ReEnable2.
+  </obsolete>
+  <owner>kalman@chromium.org</owner>
+  <owner>rpaquay@chromium.org</owner>
+  <summary>
+    The permissions present in an extension when it was re-enabled from a
+    confirmation prompt.
+  </summary>
+</histogram>
+
+<histogram name="Extensions.Permissions_ReEnable2" enum="ExtensionPermission2">
+  <owner>kalman@chromium.org</owner>
+  <owner>rpaquay@chromium.org</owner>
   <summary>
     The permissions present in an extension when it was re-enabled from a
     confirmation prompt.
@@ -6200,7 +7039,21 @@ other types of suffix sets.
 
 <histogram name="Extensions.Permissions_ReEnableAbort"
     enum="ExtensionPermission">
-  <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
+  <obsolete>
+    Deprecated as of 5/2014, replaced by Extensions.Permissions_ReEnableAbort2.
+  </obsolete>
+  <owner>kalman@chromium.org</owner>
+  <owner>rpaquay@chromium.org</owner>
+  <summary>
+    The permissions present in an extension when the re-enable prompt was
+    aborted, not including installation errors and manual user cancels.
+  </summary>
+</histogram>
+
+<histogram name="Extensions.Permissions_ReEnableAbort2"
+    enum="ExtensionPermission2">
+  <owner>kalman@chromium.org</owner>
+  <owner>rpaquay@chromium.org</owner>
   <summary>
     The permissions present in an extension when the re-enable prompt was
     aborted, not including installation errors and manual user cancels.
@@ -6209,7 +7062,21 @@ other types of suffix sets.
 
 <histogram name="Extensions.Permissions_ReEnableCancel"
     enum="ExtensionPermission">
-  <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
+  <obsolete>
+    Deprecated as of 5/2014, replaced by Extensions.Permissions_ReEnableCancel2.
+  </obsolete>
+  <owner>kalman@chromium.org</owner>
+  <owner>rpaquay@chromium.org</owner>
+  <summary>
+    The permissions present in an extension when the re-enable was canceled from
+    the confirmation prompt.
+  </summary>
+</histogram>
+
+<histogram name="Extensions.Permissions_ReEnableCancel2"
+    enum="ExtensionPermission2">
+  <owner>kalman@chromium.org</owner>
+  <owner>rpaquay@chromium.org</owner>
   <summary>
     The permissions present in an extension when the re-enable was canceled from
     the confirmation prompt.
@@ -6217,7 +7084,19 @@ other types of suffix sets.
 </histogram>
 
 <histogram name="Extensions.Permissions_Uninstall" enum="ExtensionPermission">
-  <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
+  <obsolete>
+    Deprecated as of 5/2014, replaced by Extensions.Permissions_Uninstall2.
+  </obsolete>
+  <owner>kalman@chromium.org</owner>
+  <owner>rpaquay@chromium.org</owner>
+  <summary>
+    The permissions present in an extension when it was uninstalled.
+  </summary>
+</histogram>
+
+<histogram name="Extensions.Permissions_Uninstall2" enum="ExtensionPermission2">
+  <owner>kalman@chromium.org</owner>
+  <owner>rpaquay@chromium.org</owner>
   <summary>
     The permissions present in an extension when it was uninstalled.
   </summary>
@@ -6225,7 +7104,22 @@ other types of suffix sets.
 
 <histogram name="Extensions.Permissions_WebStoreInstall"
     enum="ExtensionPermission">
-  <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
+  <obsolete>
+    Deprecated as of 5/2014, replaced by
+    Extensions.Permissions_WebStoreInstall2.
+  </obsolete>
+  <owner>kalman@chromium.org</owner>
+  <owner>rpaquay@chromium.org</owner>
+  <summary>
+    The permissions present in an extension when it was installed through the
+    web store.
+  </summary>
+</histogram>
+
+<histogram name="Extensions.Permissions_WebStoreInstall2"
+    enum="ExtensionPermission2">
+  <owner>kalman@chromium.org</owner>
+  <owner>rpaquay@chromium.org</owner>
   <summary>
     The permissions present in an extension when it was installed through the
     web store.
@@ -6234,7 +7128,22 @@ other types of suffix sets.
 
 <histogram name="Extensions.Permissions_WebStoreInstallAbort"
     enum="ExtensionPermission">
-  <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
+  <obsolete>
+    Deprecated as of 5/2014, replaced by
+    Extensions.Permissions_WebStoreInstallAbort2.
+  </obsolete>
+  <owner>kalman@chromium.org</owner>
+  <owner>rpaquay@chromium.org</owner>
+  <summary>
+    The permissions present in an extension when installation from the web store
+    was aborted, not including installation errors and user cancels.
+  </summary>
+</histogram>
+
+<histogram name="Extensions.Permissions_WebStoreInstallAbort2"
+    enum="ExtensionPermission2">
+  <owner>kalman@chromium.org</owner>
+  <owner>rpaquay@chromium.org</owner>
   <summary>
     The permissions present in an extension when installation from the web store
     was aborted, not including installation errors and user cancels.
@@ -6243,7 +7152,22 @@ other types of suffix sets.
 
 <histogram name="Extensions.Permissions_WebStoreInstallCancel"
     enum="ExtensionPermission">
-  <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
+  <obsolete>
+    Deprecated as of 5/2014, replaced by
+    Extensions.Permissions_WebStoreInstallCancel2.
+  </obsolete>
+  <owner>kalman@chromium.org</owner>
+  <owner>rpaquay@chromium.org</owner>
+  <summary>
+    The permissions present in an extension when installation from the web store
+    was canceled.
+  </summary>
+</histogram>
+
+<histogram name="Extensions.Permissions_WebStoreInstallCancel2"
+    enum="ExtensionPermission2">
+  <owner>kalman@chromium.org</owner>
+  <owner>rpaquay@chromium.org</owner>
   <summary>
     The permissions present in an extension when installation from the web store
     was canceled.
@@ -6622,6 +7546,52 @@ other types of suffix sets.
   </summary>
 </histogram>
 
+<histogram name="ExtensionUrlRequest.HashTimeMs" units="milliseconds">
+  <owner>asargent@chromium.org</owner>
+  <summary>
+    The total time taken to compute a cryptographic hash of the content read for
+    a chrome-extension:// URL, logged at the end of each request we load from
+    the corresponding file for that URL in the filesystem.
+  </summary>
+</histogram>
+
+<histogram name="ExtensionUrlRequest.OnReadCompleteError" enum="NetErrorCodes">
+  <owner>asargent@chromium.org</owner>
+  <summary>
+    The error code for failures of incremental reads of a file stream for a
+    chrome-extension:// URL. (See also ExtensionUrlRequest.OnReadCompleteResult
+    for the success case).
+  </summary>
+</histogram>
+
+<histogram name="ExtensionUrlRequest.OnReadCompleteResult">
+  <owner>asargent@chromium.org</owner>
+  <summary>
+    The result of an incremental read of a file stream for a chrome-extension://
+    URL, representing a byte count. Logged in success cases (see also
+    ExtensionUrlRequest.OnReadCompleteError).
+  </summary>
+</histogram>
+
+<histogram name="ExtensionUrlRequest.SeekPosition">
+  <owner>asargent@chromium.org</owner>
+  <summary>
+    When fetching a chrome-extension:// URL, this indicates the first byte
+    position we read from. This will be greater than 0 in cases such as XHR's
+    with a Range header, but will normally be 0 in the typical case of reading
+    the entire file. This helps identify how frequently partial file reads are
+    taking place.
+  </summary>
+</histogram>
+
+<histogram name="ExtensionUrlRequest.TotalKbRead" units="KB">
+  <owner>asargent@chromium.org</owner>
+  <summary>
+    The total number of bytes read for a chrome-extension:// URL, logged when
+    the job is finished (either successfully or not).
+  </summary>
+</histogram>
+
 <histogram name="FileBrowser.Create" enum="FileDialogType">
   <owner>joshwoodward@google.com</owner>
   <summary>Chrome OS File Browser opening mode.</summary>
@@ -6852,11 +7822,38 @@ other types of suffix sets.
   </summary>
 </histogram>
 
+<histogram name="FileBrowser.VolumeType" enum="FileManagerVolumeType">
+  <owner>kinaba@chromium.org</owner>
+  <summary>
+    Chrome OS File Browser: counts the number of times volumes are mounted for
+    each volume type.
+  </summary>
+</histogram>
+
+<histogram name="GCM.APICallUnregister">
+  <owner>jianli@chromium.org</owner>
+  <summary>Number of times when gcm.unregister API is called.</summary>
+</histogram>
+
+<histogram name="GCM.CheckinCompleteTime" units="milliseconds">
+  <owner>jianli@chromium.org</owner>
+  <summary>
+    Length of time taken to complete a GCM checkin request successfully. If the
+    checkin is retried multiple times, the length of time is counted for the
+    last successful retry.
+  </summary>
+</histogram>
+
 <histogram name="GCM.CheckinRequestStatus" enum="GCMCheckinRequestStatus">
   <owner>juyik@chromium.org</owner>
   <summary>Status code of the outcome of a GCM checkin request.</summary>
 </histogram>
 
+<histogram name="GCM.CheckinRetryCount">
+  <owner>jianli@chromium.org</owner>
+  <summary>Number of retries before a GCM checkin succeeds.</summary>
+</histogram>
+
 <histogram name="GCM.ConnectedViaProxy" enum="Boolean">
   <owner>zea@chromium.org</owner>
   <summary>Whether the GCM connection was made via a proxy or not.</summary>
@@ -6898,6 +7895,14 @@ other types of suffix sets.
   </summary>
 </histogram>
 
+<histogram name="GCM.LoadSucceeded" enum="BooleanSuccess">
+  <owner>zea@chromium.org</owner>
+  <summary>
+    Success indicates successfully loading an initialized persistent GCM store
+    at startup time. Failure indicates a failure loading the store.
+  </summary>
+</histogram>
+
 <histogram name="GCM.NumThrottledApps">
   <owner>zea@chromium.org</owner>
   <summary>
@@ -6916,12 +7921,39 @@ other types of suffix sets.
   </summary>
 </histogram>
 
+<histogram name="GCM.OutgoingMessageTTL" enum="GCMOutgoingMessageTTLCategory">
+  <owner>jianli@chromium.org</owner>
+  <summary>
+    Category of TTL specified in the outgoing message: 0, less than or equal to
+    1 minute, less than or equal to 1 hour and etc.
+  </summary>
+</histogram>
+
+<histogram name="GCM.RegistrationCompleteTime" units="milliseconds">
+  <owner>jianli@chromium.org</owner>
+  <summary>
+    Length of time taken to complete a GCM registration request successfully. If
+    the registration is retried multiple times, the length of time is counted
+    for the last successful retry.
+  </summary>
+</histogram>
+
 <histogram name="GCM.RegistrationRequestStatus"
     enum="GCMRegistrationRequestStatus">
   <owner>juyik@chromium.org</owner>
   <summary>Status code of the outcome of a GCM registration request.</summary>
 </histogram>
 
+<histogram name="GCM.RegistrationRetryCount">
+  <owner>jianli@chromium.org</owner>
+  <summary>Number of retries before a GCM registration succeeds.</summary>
+</histogram>
+
+<histogram name="GCM.RegistrationSenderIdCount">
+  <owner>jianli@chromium.org</owner>
+  <summary>Number of sender IDs specified in a registration request.</summary>
+</histogram>
+
 <histogram name="GCM.RestoredIncomingMessages">
   <owner>zea@chromium.org</owner>
   <summary>
@@ -6954,14 +7986,6 @@ other types of suffix sets.
   </summary>
 </histogram>
 
-<histogram name="GCM.StoreLoadSucceeded" enum="BooleanSuccess">
-  <owner>zea@chromium.org</owner>
-  <summary>
-    Success indicates successfully loading an initialized persistent GCM store
-    at startup time. Failure indicates a failure loading the store.
-  </summary>
-</histogram>
-
 <histogram name="GCM.StoreSizeKB" units="kilobytes">
   <owner>zea@chromium.org</owner>
   <summary>Size of the GCM persistent store in kilobytes at startup.</summary>
@@ -6975,12 +7999,26 @@ other types of suffix sets.
   </summary>
 </histogram>
 
+<histogram name="GCM.UnregistrationCompleteTime" units="milliseconds">
+  <owner>jianli@chromium.org</owner>
+  <summary>
+    Length of time taken to complete a GCM unregistration request successfully.
+    If the unregistration is retried multiple times, the length of time is
+    counted for the last successful retry.
+  </summary>
+</histogram>
+
 <histogram name="GCM.UnregistrationRequestStatus"
     enum="GCMUnregistrationRequestStatus">
   <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
   <summary>Status code of the outcome of a GCM unregistration request.</summary>
 </histogram>
 
+<histogram name="GCM.UnregistrationRetryCount">
+  <owner>jianli@chromium.org</owner>
+  <summary>Number of retries before a GCM unregistration succeeds.</summary>
+</histogram>
+
 <histogram name="GCMInvalidations.IncomingMessageStatus"
     enum="GCMInvalidationsIncomingMessageStatus">
   <owner>pavely@chromium.org</owner>
@@ -7086,6 +8124,12 @@ other types of suffix sets.
   <summary>Events in GeolocationInfoBarDelegateAndroid.</summary>
 </histogram>
 
+<histogram name="Geolocation.LocationUpdate.ErrorCode"
+    enum="GeopositionErrorCode">
+  <owner>mvanouwerkerk@chromium.org</owner>
+  <summary>Error code for the geoposition sent to the renderers.</summary>
+</histogram>
+
 <histogram name="Geolocation.NetworkLocationRequest.AccessPoints">
   <owner>mvanouwerkerk@chromium.org</owner>
   <summary>
@@ -7129,8 +8173,25 @@ other types of suffix sets.
   <summary>Events in Google Now component extension.</summary>
 </histogram>
 
+<histogram name="GoogleNow.MessageCenter.Displayed.NotificationsVisible"
+    units="count">
+  <owner>robliao@chromium.org</owner>
+  <owner>skare@chromium.org</owner>
+  <summary>
+    Count of the number of Google Now notifications visible when the message
+    center/notification center is shown.
+  </summary>
+</histogram>
+
+<histogram name="GoogleSearch.AccessPoint" enum="SearchAccessPoint">
+  <owner>kmadhusu@chromium.org</owner>
+  <summary>
+    Counts number of Google searches from various access points in the browser.
+  </summary>
+</histogram>
+
 <histogram name="GoogleUpdate.EffectivePolicy" enum="UpdatePolicy">
-  <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
+  <owner>gab@chromium.org</owner>
   <summary>
     The effective update policy for Chrome on Windows. Recorded once per startup
     (following a 45 seconds delay).
@@ -7179,6 +8240,31 @@ other types of suffix sets.
   </summary>
 </histogram>
 
+<histogram name="HIDDetection.OOBEDevicesDetectedOnContinuePressed"
+    enum="HIDContinueScenarioType">
+  <owner>merkulova@chromium.org</owner>
+  <summary>
+    Which HID were detected when user pressed Continue on OOBE dialog. This
+    metric is specific to ChromeOS.
+  </summary>
+</histogram>
+
+<histogram name="HIDDetection.OOBEDialogShown">
+  <owner>merkulova@chromium.org</owner>
+  <summary>
+    Whether HID detection dialog was shown on OOBE. Logged on screen show or on
+    screen skip respectively. This metric is specific to ChromeOS.
+  </summary>
+</histogram>
+
+<histogram name="HIDDetection.TimesDialogShownPerOOBECompleted">
+  <owner>merkulova@chromium.org</owner>
+  <summary>
+    Records number of times the dialog was shown by the time OOBE is completed.
+    This metric is specific to ChromeOS.
+  </summary>
+</histogram>
+
 <histogram name="History.DeleteFTSIndexDatabases">
   <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
   <summary>
@@ -7309,6 +8395,7 @@ other types of suffix sets.
 </histogram>
 
 <histogram name="Hotword.AudioLoggingEnabled" enum="BooleanEnabled">
+  <owner>rlp@chromium.org</owner>
   <summary>
     The state of the hotword audio logging preference. This value is emitted
     each time the hotword availability is requested by the extension if the user
@@ -7335,6 +8422,15 @@ other types of suffix sets.
   </summary>
 </histogram>
 
+<histogram name="Hotword.HotwordError" enum="HotwordError">
+  <owner>rlp@chromium.org</owner>
+  <summary>
+    Errors reported by the hotword service when determining if hotwording is
+    available. Non-errors are also reported so that errors can be seen as a
+    percentage of total requests.
+  </summary>
+</histogram>
+
 <histogram name="HttpCache.EntryLockWait" units="milliseconds">
   <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
   <summary>
@@ -7994,6 +9090,40 @@ other types of suffix sets.
   </summary>
 </histogram>
 
+<histogram name="InstantSearchClicks.PreviewScrollState"
+    enum="InstantSearchClicks_PreviewScrollState">
+  <owner>ksimbili@chromium.org</owner>
+  <summary>
+    Records the scroll state on the preview page when instant search clicks
+    feature is triggered.
+  </summary>
+</histogram>
+
+<histogram name="InstantSearchClicks.ReasonForSwap"
+    enum="InstantSearchClicks_ReasonForSwap">
+  <owner>ksimbili@chromium.org</owner>
+  <summary>
+    Records the reason that triggered the page swap when instant search clicks
+    feature is triggered.
+  </summary>
+</histogram>
+
+<histogram name="InstantSearchClicks.TimeInPreview" units="milliseconds">
+  <owner>ksimbili@chromium.org</owner>
+  <summary>
+    The time spent by the user in preview page before swapping to original or
+    navigating out of preview page.
+  </summary>
+</histogram>
+
+<histogram name="InstantSearchClicks.TimeToSwap" units="milliseconds">
+  <owner>ksimbili@chromium.org</owner>
+  <summary>
+    The time it took for swap to trigger for all swaps. The is the time between
+    preview page load start to preview page swap with the original page.
+  </summary>
+</histogram>
+
 <histogram name="interstitial.authority_invalid_time" units="milliseconds">
   <obsolete>
     Removed on 8/1/13.
@@ -8321,11 +9451,33 @@ other types of suffix sets.
   </summary>
 </histogram>
 
+<histogram name="LevelDBPrefStore.ReadErrors" enum="LevelDBPrefStoreErrorCodes">
+  <owner>dgrogan@chromium.org</owner>
+  <summary>
+    Bitfield that indicates errors and recovery that occurred when opening a
+    LevelDB preferences database.
+  </summary>
+</histogram>
+
+<histogram name="LibraryLoader.NativeLibraryHack" enum="BooleanUsage">
+  <owner>feng@chromium.org</owner>
+  <summary>
+    A boolean that indicates whether the workaround of a Sony framework bug was
+    used. The metric is Android-specific, and is logged when the browser starts.
+    See more details at http://crbug.com/311644.
+  </summary>
+</histogram>
+
 <histogram name="Linux.GlibcVersion" enum="LinuxGlibcVersion">
   <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
   <summary>The version of glibc used. (Linux only)</summary>
 </histogram>
 
+<histogram name="Linux.WindowManager" enum="LinuxWindowManagerName">
+  <owner>pkotwicz@chromium.org</owner>
+  <summary>The window manager used. (Linux only) Logged at startup.</summary>
+</histogram>
+
 <histogram name="LocalDiscovery.ClientRestartAttempts">
   <owner>noamsml@chromium.org</owner>
   <owner>vitalybuka@chromium.org</owner>
@@ -8350,6 +9502,26 @@ other types of suffix sets.
   <summary>Records events related to devices page.</summary>
 </histogram>
 
+<histogram name="LocalDiscovery.FirewallAccessTime" units="milliseconds">
+  <owner>noamsml@chromium.org</owner>
+  <owner>vitalybuka@chromium.org</owner>
+  <summary>
+    Windows only histogram that reports request time spend accessing firewall
+    rules. It's logged once per browser process lifetime, when local discovery
+    is used first time.
+  </summary>
+</histogram>
+
+<histogram name="LocalDiscovery.IsFirewallReady" enum="BooleanEnabled">
+  <owner>noamsml@chromium.org</owner>
+  <owner>vitalybuka@chromium.org</owner>
+  <summary>
+    Windows only histogram that reports, whether a firewall is set, so we can
+    bind inbound sockets. It's logged once per browser process lifetime, when
+    local discovery is used first time.
+  </summary>
+</histogram>
+
 <histogram name="LocalDiscovery.PrivetNotificationsEvent"
     enum="PrivetNotificationsEvent">
   <owner>noamsml@chromium.org</owner>
@@ -8397,6 +9569,25 @@ other types of suffix sets.
   <summary>Chrome OS login success reason.</summary>
 </histogram>
 
+<histogram name="Login.UsersActiveWeekly" units="users">
+  <owner>alemate@chromium.org</owner>
+  <owner>nkostylev@chromium.org</owner>
+  <summary>
+    Chrome OS histogram that keeps track of number of users who have logged in
+    in the last 7 days. Reported on every boot and once a day after that.
+  </summary>
+</histogram>
+
+<histogram name="Login.UsersActiveWeekly.Percent" units="%">
+  <owner>alemate@chromium.org</owner>
+  <owner>nkostylev@chromium.org</owner>
+  <summary>
+    Chrome OS histogram that keeps track of percentage of local users who have
+    logged in in the last 7 days. Reported on every boot and once a day after
+    that.
+  </summary>
+</histogram>
+
 <histogram name="Login.UserType" enum="LoginUserType">
   <owner>cmasone@chromium.org</owner>
   <summary>
@@ -8441,6 +9632,14 @@ other types of suffix sets.
   <summary>Measures the time taken for AudioInputController::</summary>
 </histogram>
 
+<histogram name="Media.AudioInputControllerCaptureStartupSuccess"
+    enum="BooleanSuccess">
+  <summary>
+    Whether capture started successfully after an input stream startup was
+    requested.
+  </summary>
+</histogram>
+
 <histogram name="Media.AudioInputDeviceManager" units="ms">
   <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
   <summary>Measures the time taken for AudioInputDeviceManager::</summary>
@@ -8625,6 +9824,14 @@ other types of suffix sets.
   <summary>EME NeedKey event count.</summary>
 </histogram>
 
+<histogram name="Media.EME.OutputProtection" enum="MediaOutputProtectionStatus">
+  <owner>xhwang@chromium.org</owner>
+  <summary>
+    Output protection query status and result. One query and one positive (no
+    unprotected external links) result (if any) are reported per CDM instance.
+  </summary>
+</histogram>
+
 <histogram name="Media.EME.Unknown.addKey" enum="MediaKeyException">
   <owner>xhwang@chromium.org</owner>
   <summary>addKey result using an unknown key system.</summary>
@@ -9902,6 +11109,7 @@ other types of suffix sets.
 </histogram>
 
 <histogram name="NaCl.Client.Helper.InitState" enum="NaClHelperStatus">
+  <owner>jvoung@chromium.org</owner>
   <owner>mackinlay@google.com</owner>
   <owner>ncbray@chromium.org</owner>
   <summary>
@@ -9910,6 +11118,7 @@ other types of suffix sets.
 </histogram>
 
 <histogram name="NaCl.Client.Helper.StateOnFork" enum="NaClHelperStatus">
+  <owner>jvoung@chromium.org</owner>
   <owner>mackinlay@google.com</owner>
   <owner>ncbray@chromium.org</owner>
   <summary>
@@ -9919,6 +11128,7 @@ other types of suffix sets.
 </histogram>
 
 <histogram name="NaCl.Client.OSArch" enum="NaClOSArchEnum">
+  <owner>jvoung@chromium.org</owner>
   <owner>mackinlay@google.com</owner>
   <owner>ncbray@chromium.org</owner>
   <summary>The OS/Architecture of a nexe that was loaded.</summary>
@@ -9926,6 +11136,7 @@ other types of suffix sets.
 
 <histogram name="NaCl.HttpStatusCodeClass.Manifest.InstalledApp"
     enum="NaClHttpStatusCodeClass">
+  <owner>jvoung@chromium.org</owner>
   <owner>mackinlay@google.com</owner>
   <owner>ncbray@chromium.org</owner>
   <summary>
@@ -9936,6 +11147,7 @@ other types of suffix sets.
 
 <histogram name="NaCl.HttpStatusCodeClass.Manifest.NotInstalledApp"
     enum="NaClHttpStatusCodeClass">
+  <owner>jvoung@chromium.org</owner>
   <owner>mackinlay@google.com</owner>
   <owner>ncbray@chromium.org</owner>
   <summary>
@@ -9946,6 +11158,7 @@ other types of suffix sets.
 
 <histogram name="NaCl.HttpStatusCodeClass.Nexe.InstalledApp"
     enum="NaClHttpStatusCodeClass">
+  <owner>jvoung@chromium.org</owner>
   <owner>mackinlay@google.com</owner>
   <owner>ncbray@chromium.org</owner>
   <summary>
@@ -9956,6 +11169,7 @@ other types of suffix sets.
 
 <histogram name="NaCl.HttpStatusCodeClass.Nexe.NotInstalledApp"
     enum="NaClHttpStatusCodeClass">
+  <owner>jvoung@chromium.org</owner>
   <owner>mackinlay@google.com</owner>
   <owner>ncbray@chromium.org</owner>
   <summary>
@@ -9965,6 +11179,7 @@ other types of suffix sets.
 </histogram>
 
 <histogram name="NaCl.LoadStatus.Plugin" enum="NaClPluginErrorCode">
+  <owner>jvoung@chromium.org</owner>
   <owner>mackinlay@google.com</owner>
   <owner>ncbray@chromium.org</owner>
   <summary>The error code returned by NaCl's Chrome plugin.</summary>
@@ -9972,6 +11187,7 @@ other types of suffix sets.
 
 <histogram name="NaCl.LoadStatus.Plugin.InstalledApp"
     enum="NaClPluginErrorCode">
+  <owner>jvoung@chromium.org</owner>
   <owner>mackinlay@google.com</owner>
   <owner>ncbray@chromium.org</owner>
   <summary>
@@ -9982,6 +11198,7 @@ other types of suffix sets.
 
 <histogram name="NaCl.LoadStatus.Plugin.NotInstalledApp"
     enum="NaClPluginErrorCode">
+  <owner>jvoung@chromium.org</owner>
   <owner>mackinlay@google.com</owner>
   <owner>ncbray@chromium.org</owner>
   <summary>
@@ -9991,6 +11208,7 @@ other types of suffix sets.
 </histogram>
 
 <histogram name="NaCl.LoadStatus.SelLdr" enum="NaClSelLdrErrorCode">
+  <owner>jvoung@chromium.org</owner>
   <owner>mackinlay@google.com</owner>
   <owner>ncbray@chromium.org</owner>
   <summary>The error code returned by NaCl's sel_ldr.</summary>
@@ -9998,6 +11216,7 @@ other types of suffix sets.
 
 <histogram name="NaCl.LoadStatus.SelLdr.InstalledApp"
     enum="NaClSelLdrErrorCode">
+  <owner>jvoung@chromium.org</owner>
   <owner>mackinlay@google.com</owner>
   <owner>ncbray@chromium.org</owner>
   <summary>
@@ -10007,6 +11226,7 @@ other types of suffix sets.
 
 <histogram name="NaCl.LoadStatus.SelLdr.NotInstalledApp"
     enum="NaClSelLdrErrorCode">
+  <owner>jvoung@chromium.org</owner>
   <owner>mackinlay@google.com</owner>
   <owner>ncbray@chromium.org</owner>
   <summary>
@@ -10015,6 +11235,7 @@ other types of suffix sets.
 </histogram>
 
 <histogram name="NaCl.Manifest.IsDataURI" enum="NaClManifestType">
+  <owner>jvoung@chromium.org</owner>
   <owner>mackinlay@google.com</owner>
   <owner>ncbray@chromium.org</owner>
   <summary>
@@ -10026,6 +11247,7 @@ other types of suffix sets.
   <obsolete>
     Deprecated 6/2011, renamed.
   </obsolete>
+  <owner>jvoung@chromium.org</owner>
   <owner>mackinlay@google.com</owner>
   <owner>ncbray@chromium.org</owner>
   <summary>
@@ -10034,12 +11256,14 @@ other types of suffix sets.
 </histogram>
 
 <histogram name="NaCl.ModuleUptime.Crash" units="milliseconds">
+  <owner>jvoung@chromium.org</owner>
   <owner>mackinlay@google.com</owner>
   <owner>ncbray@chromium.org</owner>
   <summary>The time a NaCl module ran before it crashed.</summary>
 </histogram>
 
 <histogram name="NaCl.ModuleUptime.Normal" units="milliseconds">
+  <owner>jvoung@chromium.org</owner>
   <owner>mackinlay@google.com</owner>
   <owner>ncbray@chromium.org</owner>
   <summary>The time a NaCl module ran without crashing, at shutdown.</summary>
@@ -10049,6 +11273,7 @@ other types of suffix sets.
   <obsolete>
     Deprecated 6/2011, renamed.
   </obsolete>
+  <owner>jvoung@chromium.org</owner>
   <owner>mackinlay@google.com</owner>
   <owner>ncbray@chromium.org</owner>
   <summary>
@@ -10060,6 +11285,7 @@ other types of suffix sets.
   <obsolete>
     Deprecated 6/2011, renamed.
   </obsolete>
+  <owner>jvoung@chromium.org</owner>
   <owner>mackinlay@google.com</owner>
   <owner>ncbray@chromium.org</owner>
   <summary>
@@ -10071,6 +11297,7 @@ other types of suffix sets.
   <obsolete>
     Deprecated 6/2011, renamed.
   </obsolete>
+  <owner>jvoung@chromium.org</owner>
   <owner>mackinlay@google.com</owner>
   <owner>ncbray@chromium.org</owner>
   <summary>
@@ -10084,6 +11311,7 @@ other types of suffix sets.
   <obsolete>
     Deprecated 6/2011, renamed.
   </obsolete>
+  <owner>jvoung@chromium.org</owner>
   <owner>mackinlay@google.com</owner>
   <owner>ncbray@chromium.org</owner>
   <summary>
@@ -10094,6 +11322,7 @@ other types of suffix sets.
 </histogram>
 
 <histogram name="NaCl.Options.PNaCl.OptLevel" enum="PNaClOptionsOptLevelEnum">
+  <owner>jvoung@chromium.org</owner>
   <owner>mackinlay@google.com</owner>
   <owner>ncbray@chromium.org</owner>
   <summary>
@@ -10106,12 +11335,14 @@ other types of suffix sets.
   <obsolete>
     Deprecated 6/2011, renamed.
   </obsolete>
+  <owner>jvoung@chromium.org</owner>
   <owner>mackinlay@google.com</owner>
   <owner>ncbray@chromium.org</owner>
   <summary>The OS/Architecture of a nexe that was loaded.</summary>
 </histogram>
 
 <histogram name="NaCl.Perf.PNaClCache.IsHit" enum="PNaClTranslationCacheEnum">
+  <owner>jvoung@chromium.org</owner>
   <owner>mackinlay@google.com</owner>
   <owner>ncbray@chromium.org</owner>
   <summary>
@@ -10121,6 +11352,7 @@ other types of suffix sets.
 </histogram>
 
 <histogram name="NaCl.Perf.PNaClLoadTime.CompileKBPerSec" units="KB/s">
+  <owner>jvoung@chromium.org</owner>
   <owner>mackinlay@google.com</owner>
   <owner>ncbray@chromium.org</owner>
   <summary>
@@ -10130,6 +11362,7 @@ other types of suffix sets.
 </histogram>
 
 <histogram name="NaCl.Perf.PNaClLoadTime.CompileTime" units="milliseconds">
+  <owner>jvoung@chromium.org</owner>
   <owner>mackinlay@google.com</owner>
   <owner>ncbray@chromium.org</owner>
   <summary>
@@ -10139,6 +11372,7 @@ other types of suffix sets.
 </histogram>
 
 <histogram name="NaCl.Perf.PNaClLoadTime.LinkTime" units="milliseconds">
+  <owner>jvoung@chromium.org</owner>
   <owner>mackinlay@google.com</owner>
   <owner>ncbray@chromium.org</owner>
   <summary>
@@ -10148,6 +11382,7 @@ other types of suffix sets.
 </histogram>
 
 <histogram name="NaCl.Perf.PNaClLoadTime.LoadCompiler" units="milliseconds">
+  <owner>jvoung@chromium.org</owner>
   <owner>mackinlay@google.com</owner>
   <owner>ncbray@chromium.org</owner>
   <summary>
@@ -10156,6 +11391,7 @@ other types of suffix sets.
 </histogram>
 
 <histogram name="NaCl.Perf.PNaClLoadTime.LoadLinker" units="milliseconds">
+  <owner>jvoung@chromium.org</owner>
   <owner>mackinlay@google.com</owner>
   <owner>ncbray@chromium.org</owner>
   <summary>
@@ -10165,6 +11401,7 @@ other types of suffix sets.
 
 <histogram name="NaCl.Perf.PNaClLoadTime.PctCompiledWhenFullyDownloaded"
     units="%">
+  <owner>jvoung@chromium.org</owner>
   <owner>mackinlay@google.com</owner>
   <owner>ncbray@chromium.org</owner>
   <summary>
@@ -10175,6 +11412,7 @@ other types of suffix sets.
 </histogram>
 
 <histogram name="NaCl.Perf.PNaClLoadTime.TotalUncachedKBPerSec" units="KB/s">
+  <owner>jvoung@chromium.org</owner>
   <owner>mackinlay@google.com</owner>
   <owner>ncbray@chromium.org</owner>
   <summary>
@@ -10186,6 +11424,7 @@ other types of suffix sets.
 
 <histogram name="NaCl.Perf.PNaClLoadTime.TotalUncachedTime"
     units="milliseconds">
+  <owner>jvoung@chromium.org</owner>
   <owner>mackinlay@google.com</owner>
   <owner>ncbray@chromium.org</owner>
   <summary>
@@ -10195,12 +11434,14 @@ other types of suffix sets.
 </histogram>
 
 <histogram name="NaCl.Perf.Size.Manifest" units="KB">
+  <owner>jvoung@chromium.org</owner>
   <owner>mackinlay@google.com</owner>
   <owner>ncbray@chromium.org</owner>
   <summary>The size of the manifest file.</summary>
 </histogram>
 
 <histogram name="NaCl.Perf.Size.Nexe" units="KB">
+  <owner>jvoung@chromium.org</owner>
   <owner>mackinlay@google.com</owner>
   <owner>ncbray@chromium.org</owner>
   <summary>
@@ -10209,6 +11450,7 @@ other types of suffix sets.
 </histogram>
 
 <histogram name="NaCl.Perf.Size.Pexe" units="KB">
+  <owner>jvoung@chromium.org</owner>
   <owner>mackinlay@google.com</owner>
   <owner>ncbray@chromium.org</owner>
   <summary>
@@ -10218,6 +11460,7 @@ other types of suffix sets.
 </histogram>
 
 <histogram name="NaCl.Perf.Size.PexeNexeSizePct" units="%">
+  <owner>jvoung@chromium.org</owner>
   <owner>mackinlay@google.com</owner>
   <owner>ncbray@chromium.org</owner>
   <summary>
@@ -10227,6 +11470,7 @@ other types of suffix sets.
 </histogram>
 
 <histogram name="NaCl.Perf.Size.PNaClTranslatedNexe" units="KB">
+  <owner>jvoung@chromium.org</owner>
   <owner>mackinlay@google.com</owner>
   <owner>ncbray@chromium.org</owner>
   <summary>
@@ -10237,12 +11481,14 @@ other types of suffix sets.
 </histogram>
 
 <histogram name="NaCl.Perf.StartupTime.LoadModule" units="milliseconds">
+  <owner>jvoung@chromium.org</owner>
   <owner>mackinlay@google.com</owner>
   <owner>ncbray@chromium.org</owner>
   <summary>The time it took to load the NaCl module into sel_ldr.</summary>
 </histogram>
 
 <histogram name="NaCl.Perf.StartupTime.LoadModulePerMB" units="milliseconds/MB">
+  <owner>jvoung@chromium.org</owner>
   <owner>mackinlay@google.com</owner>
   <owner>ncbray@chromium.org</owner>
   <summary>
@@ -10252,6 +11498,7 @@ other types of suffix sets.
 </histogram>
 
 <histogram name="NaCl.Perf.StartupTime.ManifestDownload" units="milliseconds">
+  <owner>jvoung@chromium.org</owner>
   <owner>mackinlay@google.com</owner>
   <owner>ncbray@chromium.org</owner>
   <summary>
@@ -10260,6 +11507,7 @@ other types of suffix sets.
 </histogram>
 
 <histogram name="NaCl.Perf.StartupTime.NaClOverhead" units="milliseconds">
+  <owner>jvoung@chromium.org</owner>
   <owner>mackinlay@google.com</owner>
   <owner>ncbray@chromium.org</owner>
   <summary>
@@ -10271,6 +11519,7 @@ other types of suffix sets.
 
 <histogram name="NaCl.Perf.StartupTime.NaClOverheadPerMB"
     units="milliseconds/MB">
+  <owner>jvoung@chromium.org</owner>
   <owner>mackinlay@google.com</owner>
   <owner>ncbray@chromium.org</owner>
   <summary>
@@ -10282,6 +11531,7 @@ other types of suffix sets.
 </histogram>
 
 <histogram name="NaCl.Perf.StartupTime.NexeDownload" units="milliseconds">
+  <owner>jvoung@chromium.org</owner>
   <owner>mackinlay@google.com</owner>
   <owner>ncbray@chromium.org</owner>
   <summary>
@@ -10291,6 +11541,7 @@ other types of suffix sets.
 
 <histogram name="NaCl.Perf.StartupTime.NexeDownloadPerMB"
     units="milliseconds/MB">
+  <owner>jvoung@chromium.org</owner>
   <owner>mackinlay@google.com</owner>
   <owner>ncbray@chromium.org</owner>
   <summary>
@@ -10300,6 +11551,7 @@ other types of suffix sets.
 </histogram>
 
 <histogram name="NaCl.Perf.StartupTime.Total" units="milliseconds">
+  <owner>jvoung@chromium.org</owner>
   <owner>mackinlay@google.com</owner>
   <owner>ncbray@chromium.org</owner>
   <summary>
@@ -10309,6 +11561,7 @@ other types of suffix sets.
 </histogram>
 
 <histogram name="NaCl.Perf.StartupTime.TotalPerMB" units="milliseconds/MB">
+  <owner>jvoung@chromium.org</owner>
   <owner>mackinlay@google.com</owner>
   <owner>ncbray@chromium.org</owner>
   <summary>
@@ -10319,6 +11572,7 @@ other types of suffix sets.
 </histogram>
 
 <histogram name="NaCl.ShutdownTime.Total" units="milliseconds">
+  <owner>jvoung@chromium.org</owner>
   <owner>mackinlay@google.com</owner>
   <owner>ncbray@chromium.org</owner>
   <summary>The time it took the NaCl module to shut down.</summary>
@@ -10329,6 +11583,7 @@ other types of suffix sets.
     Deprecated 5/2011, data is duplicated by NaCl.NexeStartupTime, and
     normalizing to 'tab opens' is unusual.
   </obsolete>
+  <owner>jvoung@chromium.org</owner>
   <owner>mackinlay@google.com</owner>
   <owner>ncbray@chromium.org</owner>
   <summary>
@@ -10338,6 +11593,7 @@ other types of suffix sets.
 </histogram>
 
 <histogram name="NaCl.ValidationCache.Query" enum="NaClValidationCacheEnum">
+  <owner>jvoung@chromium.org</owner>
   <owner>mackinlay@google.com</owner>
   <owner>ncbray@chromium.org</owner>
   <summary>
@@ -10346,6 +11602,7 @@ other types of suffix sets.
 </histogram>
 
 <histogram name="NaCl.ValidationCache.Set" enum="NaClValidationCacheEnum">
+  <owner>jvoung@chromium.org</owner>
   <owner>mackinlay@google.com</owner>
   <owner>ncbray@chromium.org</owner>
   <summary>
@@ -10358,6 +11615,690 @@ other types of suffix sets.
   <summary>The scheme of the URL for each main-frame navigation.</summary>
 </histogram>
 
+<histogram name="Navigation.RedirectChainSize" units="characters">
+  <owner>haitaol@chromium.org</owner>
+  <owner>donnd@chromium.org</owner>
+  <summary>
+    Total length of the redirect URL strings in navigation entry. Logged when
+    entry is committed.
+  </summary>
+</histogram>
+
+<histogram name="NCN.CM.FastestRTTOn2G" units="milliseconds">
+  <owner>pauljensen@chromium.org</owner>
+  <summary>
+    Rough estimate of the fastest round-trip-time seen on a 2G connection,
+    before the NetworkChangeNotifier detected a connectivity change.
+
+    This metric is recorded when the NetworkChangeNotifier detects a
+    connectivity change.  This will miss data from users whose connection type
+    never changes and will be biased to users whose connection type changes
+    frequently.
+  </summary>
+</histogram>
+
+<histogram name="NCN.CM.FastestRTTOn3G" units="milliseconds">
+  <owner>pauljensen@chromium.org</owner>
+  <summary>
+    Rough estimate of the fastest round-trip-time seen on a 3G connection,
+    before the NetworkChangeNotifier detected a connectivity change.
+
+    This metric is recorded when the NetworkChangeNotifier detects a
+    connectivity change.  This will miss data from users whose connection type
+    never changes and will be biased to users whose connection type changes
+    frequently.
+  </summary>
+</histogram>
+
+<histogram name="NCN.CM.FastestRTTOn4G" units="milliseconds">
+  <owner>pauljensen@chromium.org</owner>
+  <summary>
+    Rough estimate of the fastest round-trip-time seen on a 4G connection,
+    before the NetworkChangeNotifier detected a connectivity change.
+
+    This metric is recorded when the NetworkChangeNotifier detects a
+    connectivity change. This will miss data from users whose connection type
+    never changes and will be biased to users whose connection type changes
+    frequently.
+  </summary>
+</histogram>
+
+<histogram name="NCN.CM.FastestRTTOnBluetooth" units="milliseconds">
+  <owner>pauljensen@chromium.org</owner>
+  <summary>
+    Rough estimate of the fastest round-trip-time seen on a Bluetooth
+    connection, before the NetworkChangeNotifier detected a connectivity change.
+
+    This metric is recorded when the NetworkChangeNotifier detects a
+    connectivity change.  This will miss data from users whose connection type
+    never changes and will be biased to users whose connection type changes
+    frequently.
+  </summary>
+</histogram>
+
+<histogram name="NCN.CM.FastestRTTOnEthernet" units="milliseconds">
+  <owner>pauljensen@chromium.org</owner>
+  <summary>
+    Rough estimate of the fastest round-trip-time seen on an Ethernet
+    connection, before the NetworkChangeNotifier detected a connectivity change.
+
+    This metric is recorded when the NetworkChangeNotifier detects a
+    connectivity change.  This will miss data from users whose connection type
+    never changes and will be biased to users whose connection type changes
+    frequently.
+  </summary>
+</histogram>
+
+<histogram name="NCN.CM.FastestRTTOnNone" units="milliseconds">
+  <owner>pauljensen@chromium.org</owner>
+  <summary>
+    Rough estimate of the fastest round-trip-time seen while the
+    NetworkChangeNotifier thought there was no network connection, before the
+    NetworkChangeNotifier detected a connectivity change.
+
+    This metric is recorded when the NetworkChangeNotifier detects a
+    connectivity change.  This will miss data from users whose connection type
+    never changes and will be biased to users whose connection type changes
+    frequently.
+  </summary>
+</histogram>
+
+<histogram name="NCN.CM.FastestRTTOnUnknown" units="milliseconds">
+  <owner>pauljensen@chromium.org</owner>
+  <summary>
+    Rough estimate of the fastest round-trip-time seen on an unknown connection
+    type, before the NetworkChangeNotifier detected a connectivity change.
+
+    This metric is recorded when the NetworkChangeNotifier detects a
+    connectivity change.  This will miss data from users whose connection type
+    never changes and will be biased to users whose connection type changes
+    frequently.
+  </summary>
+</histogram>
+
+<histogram name="NCN.CM.FastestRTTOnWifi" units="milliseconds">
+  <owner>pauljensen@chromium.org</owner>
+  <summary>
+    Rough estimate of the fastest round-trip-time seen on a Wifi connection,
+    before the NetworkChangeNotifier detected a connectivity change.
+
+    This metric is recorded when the NetworkChangeNotifier detects a
+    connectivity change.  This will miss data from users whose connection type
+    never changes and will be biased to users whose connection type changes
+    frequently.
+  </summary>
+</histogram>
+
+<histogram name="NCN.CM.FirstReadOn2G" units="milliseconds">
+  <owner>pauljensen@chromium.org</owner>
+  <summary>
+    Time between switching to a 2G connection and receiving the first network
+    data.
+
+    This metric is recorded when the NetworkChangeNotifier detects a
+    connectivity change.  This will miss data from users whose connection type
+    never changes and will be biased to users whose connection type changes
+    frequently.
+  </summary>
+</histogram>
+
+<histogram name="NCN.CM.FirstReadOn3G" units="milliseconds">
+  <owner>pauljensen@chromium.org</owner>
+  <summary>
+    Time between switching to a 3G connection and receiving the first network
+    data.
+
+    This metric is recorded when the NetworkChangeNotifier detects a
+    connectivity change.  This will miss data from users whose connection type
+    never changes and will be biased to users whose connection type changes
+    frequently.
+  </summary>
+</histogram>
+
+<histogram name="NCN.CM.FirstReadOn4G" units="milliseconds">
+  <owner>pauljensen@chromium.org</owner>
+  <summary>
+    Time between switching to a 4G connection and receiving the first network
+    data.
+
+    This metric is recorded when the NetworkChangeNotifier detects a
+    connectivity change.  This will miss data from users whose connection type
+    never changes and will be biased to users whose connection type changes
+    frequently.
+  </summary>
+</histogram>
+
+<histogram name="NCN.CM.FirstReadOnBluetooth" units="milliseconds">
+  <owner>pauljensen@chromium.org</owner>
+  <summary>
+    Time between switching to a Bluetooth connection and receiving the first
+    network data.
+
+    This metric is recorded when the NetworkChangeNotifier detects a
+    connectivity change.  This will miss data from users whose connection type
+    never changes and will be biased to users whose connection type changes
+    frequently.
+  </summary>
+</histogram>
+
+<histogram name="NCN.CM.FirstReadOnEthernet" units="milliseconds">
+  <owner>pauljensen@chromium.org</owner>
+  <summary>
+    Time between switching to an Ethernet connection and receiving the first
+    network data.
+
+    This metric is recorded when the NetworkChangeNotifier detects a
+    connectivity change.  This will miss data from users whose connection type
+    never changes and will be biased to users whose connection type changes
+    frequently.
+  </summary>
+</histogram>
+
+<histogram name="NCN.CM.FirstReadOnNone" units="milliseconds">
+  <owner>pauljensen@chromium.org</owner>
+  <summary>
+    Time between disconnecting and receiving the first network data.
+
+    This metric is recorded when the NetworkChangeNotifier detects a
+    connectivity change.  This will miss data from users whose connection type
+    never changes and will be biased to users whose connection type changes
+    frequently.
+  </summary>
+</histogram>
+
+<histogram name="NCN.CM.FirstReadOnUnknown" units="milliseconds">
+  <owner>pauljensen@chromium.org</owner>
+  <summary>
+    Time between switching to an unknown connection type and receiving the first
+    network data.
+
+    This metric is recorded when the NetworkChangeNotifier detects a
+    connectivity change.  This will miss data from users whose connection type
+    never changes and will be biased to users whose connection type changes
+    frequently.
+  </summary>
+</histogram>
+
+<histogram name="NCN.CM.FirstReadOnWifi" units="milliseconds">
+  <owner>pauljensen@chromium.org</owner>
+  <summary>
+    Time between switching to a Wifi connection and receiving the first network
+    data.
+
+    This metric is recorded when the NetworkChangeNotifier detects a
+    connectivity change.  This will miss data from users whose connection type
+    never changes and will be biased to users whose connection type changes
+    frequently.
+  </summary>
+</histogram>
+
+<histogram name="NCN.CM.KBTransferedOn2G" units="KB">
+  <owner>pauljensen@chromium.org</owner>
+  <summary>
+    How much data was transfered while connected via a 2G connection, before the
+    NetworkChangeNotifier detected a connectivity change.
+
+    This metric is recorded when the NetworkChangeNotifier detects a
+    connectivity change.  This will miss data from users whose connection type
+    never changes and will be biased to users whose connection type changes
+    frequently.
+  </summary>
+</histogram>
+
+<histogram name="NCN.CM.KBTransferedOn3G" units="KB">
+  <owner>pauljensen@chromium.org</owner>
+  <summary>
+    How much data was transfered while connected via a 3G connection, before the
+    NetworkChangeNotifier detected a connectivity change.
+
+    This metric is recorded when the NetworkChangeNotifier detects a
+    connectivity change.  This will miss data from users whose connection type
+    never changes and will be biased to users whose connection type changes
+    frequently.
+  </summary>
+</histogram>
+
+<histogram name="NCN.CM.KBTransferedOn4G" units="KB">
+  <owner>pauljensen@chromium.org</owner>
+  <summary>
+    How much data was transfered while connected via a 4G connection, before the
+    NetworkChangeNotifier detected a connectivity change.
+
+    This metric is recorded when the NetworkChangeNotifier detects a
+    connectivity change.  This will miss data from users whose connection type
+    never changes and will be biased to users whose connection type changes
+    frequently.
+  </summary>
+</histogram>
+
+<histogram name="NCN.CM.KBTransferedOnBluetooth" units="KB">
+  <owner>pauljensen@chromium.org</owner>
+  <summary>
+    How much data was transfered while connected via a Bluetooth connection,
+    before the NetworkChangeNotifier detected a connectivity change.
+
+    This metric is recorded when the NetworkChangeNotifier detects a
+    connectivity change.  This will miss data from users whose connection type
+    never changes and will be biased to users whose connection type changes
+    frequently.
+  </summary>
+</histogram>
+
+<histogram name="NCN.CM.KBTransferedOnEthernet" units="KB">
+  <owner>pauljensen@chromium.org</owner>
+  <summary>
+    How much data was transfered while connected via an Ethernet connection,
+    before the NetworkChangeNotifier detected a connectivity change.
+
+    This metric is recorded when the NetworkChangeNotifier detects a
+    connectivity change.  This will miss data from users whose connection type
+    never changes and will be biased to users whose connection type changes
+    frequently.
+  </summary>
+</histogram>
+
+<histogram name="NCN.CM.KBTransferedOnNone" units="KB">
+  <owner>pauljensen@chromium.org</owner>
+  <summary>
+    How much data was transfered while the NetworkChangeNotifier thought there
+    was no network connection, before the NetworkChangeNotifier detected a
+    connectivity change.
+
+    This metric is recorded when the NetworkChangeNotifier detects a
+    connectivity change.  This will miss data from users whose connection type
+    never changes and will be biased to users whose connection type changes
+    frequently.
+  </summary>
+</histogram>
+
+<histogram name="NCN.CM.KBTransferedOnUnknown" units="KB">
+  <owner>pauljensen@chromium.org</owner>
+  <summary>
+    How much data was transfered while connected via an unknown connection type,
+    before the NetworkChangeNotifier detected a connectivity change.
+
+    This metric is recorded when the NetworkChangeNotifier detects a
+    connectivity change.  This will miss data from users whose connection type
+    never changes and will be biased to users whose connection type changes
+    frequently.
+  </summary>
+</histogram>
+
+<histogram name="NCN.CM.KBTransferedOnWifi" units="KB">
+  <owner>pauljensen@chromium.org</owner>
+  <summary>
+    How much data was transfered while connected via a Wifi connection, before
+    the NetworkChangeNotifier detected a connectivity change.
+
+    This metric is recorded when the NetworkChangeNotifier detects a
+    connectivity change.  This will miss data from users whose connection type
+    never changes and will be biased to users whose connection type changes
+    frequently.
+  </summary>
+</histogram>
+
+<histogram name="NCN.CM.PeakKbpsOn2G" units="Kbps">
+  <owner>pauljensen@chromium.org</owner>
+  <summary>
+    Rough estimate of peak throughput seen on a 2G connection, before the
+    NetworkChangeNotifier detected a connectivity change.
+
+    This metric is recorded when the NetworkChangeNotifier detects a
+    connectivity change.  This will miss data from users whose connection type
+    never changes and will be biased to users whose connection type changes
+    frequently.
+  </summary>
+</histogram>
+
+<histogram name="NCN.CM.PeakKbpsOn3G" units="Kbps">
+  <owner>pauljensen@chromium.org</owner>
+  <summary>
+    Rough estimate of peak throughput seen on a 3G connection, before the
+    NetworkChangeNotifier detected a connectivity change.
+
+    This metric is recorded when the NetworkChangeNotifier detects a
+    connectivity change.  This will miss data from users whose connection type
+    never changes and will be biased to users whose connection type changes
+    frequently.
+  </summary>
+</histogram>
+
+<histogram name="NCN.CM.PeakKbpsOn4G" units="Kbps">
+  <owner>pauljensen@chromium.org</owner>
+  <summary>
+    Rough estimate of peak throughput seen on a 4G connection, before the
+    NetworkChangeNotifier detected a connectivity change.
+
+    This metric is recorded when the NetworkChangeNotifier detects a
+    connectivity change.  This will miss data from users whose connection type
+    never changes and will be biased to users whose connection type changes
+    frequently.
+  </summary>
+</histogram>
+
+<histogram name="NCN.CM.PeakKbpsOnBluetooth" units="Kbps">
+  <owner>pauljensen@chromium.org</owner>
+  <summary>
+    Rough estimate of peak throughput seen on a Bluetooth connection, before the
+    NetworkChangeNotifier detected a connectivity change.
+
+    This metric is recorded when the NetworkChangeNotifier detects a
+    connectivity change.  This will miss data from users whose connection type
+    never changes and will be biased to users whose connection type changes
+    frequently.
+  </summary>
+</histogram>
+
+<histogram name="NCN.CM.PeakKbpsOnEthernet" units="Kbps">
+  <owner>pauljensen@chromium.org</owner>
+  <summary>
+    Rough estimate of peak throughput seen on an Ethernet connection, before the
+    NetworkChangeNotifier detected a connectivity change.
+
+    This metric is recorded when the NetworkChangeNotifier detects a
+    connectivity change.  This will miss data from users whose connection type
+    never changes and will be biased to users whose connection type changes
+    frequently.
+  </summary>
+</histogram>
+
+<histogram name="NCN.CM.PeakKbpsOnNone" units="Kbps">
+  <owner>pauljensen@chromium.org</owner>
+  <summary>
+    Rough estimate of peak throughput seen while the NetworkChangeNotifier
+    thought there was no network connection, before the NetworkChangeNotifier
+    detected a connectivity change.
+
+    This metric is recorded when the NetworkChangeNotifier detects a
+    connectivity change.  This will miss data from users whose connection type
+    never changes and will be biased to users whose connection type changes
+    frequently.
+  </summary>
+</histogram>
+
+<histogram name="NCN.CM.PeakKbpsOnUnknown" units="Kbps">
+  <owner>pauljensen@chromium.org</owner>
+  <summary>
+    Rough estimate of peak throughput seen on an unknown connection type, before
+    the NetworkChangeNotifier detected a connectivity change.
+
+    This metric is recorded when the NetworkChangeNotifier detects a
+    connectivity change.  This will miss data from users whose connection type
+    never changes and will be biased to users whose connection type changes
+    frequently.
+  </summary>
+</histogram>
+
+<histogram name="NCN.CM.PeakKbpsOnWifi" units="Kbps">
+  <owner>pauljensen@chromium.org</owner>
+  <summary>
+    Rough estimate of peak throughput seen on a Wifi connection, before the
+    NetworkChangeNotifier detected a connectivity change.
+
+    This metric is recorded when the NetworkChangeNotifier detects a
+    connectivity change.  This will miss data from users whose connection type
+    never changes and will be biased to users whose connection type changes
+    frequently.
+  </summary>
+</histogram>
+
+<histogram name="NCN.CM.TimeOn2G" units="milliseconds">
+  <owner>pauljensen@chromium.org</owner>
+  <summary>
+    How long was spent connected via a 2G connection, before the
+    NetworkChangeNotifier detected a connectivity change.
+
+    This metric is recorded when the NetworkChangeNotifier detects a
+    connectivity change.  This will miss data from users whose connection type
+    never changes and will be biased to users whose connection type changes
+    frequently.
+  </summary>
+</histogram>
+
+<histogram name="NCN.CM.TimeOn3G" units="milliseconds">
+  <owner>pauljensen@chromium.org</owner>
+  <summary>
+    How long was spent connected via a 3G connection, before the
+    NetworkChangeNotifier detected a connectivity change.
+
+    This metric is recorded when the NetworkChangeNotifier detects a
+    connectivity change.  This will miss data from users whose connection type
+    never changes and will be biased to users whose connection type changes
+    frequently.
+  </summary>
+</histogram>
+
+<histogram name="NCN.CM.TimeOn4G" units="milliseconds">
+  <owner>pauljensen@chromium.org</owner>
+  <summary>
+    How long was spent connected via a 4G connection, before the
+    NetworkChangeNotifier detected a connectivity change.
+
+    This metric is recorded when the NetworkChangeNotifier detects a
+    connectivity change.  This will miss data from users whose connection type
+    never changes and will be biased to users whose connection type changes
+    frequently.
+  </summary>
+</histogram>
+
+<histogram name="NCN.CM.TimeOnBluetooth" units="milliseconds">
+  <owner>pauljensen@chromium.org</owner>
+  <summary>
+    How long was spent connected via a Bluetooth connection, before the
+    NetworkChangeNotifier detected a connectivity change.
+
+    This metric is recorded when the NetworkChangeNotifier detects a
+    connectivity change.  This will miss data from users whose connection type
+    never changes and will be biased to users whose connection type changes
+    frequently.
+  </summary>
+</histogram>
+
+<histogram name="NCN.CM.TimeOnEthernet" units="milliseconds">
+  <owner>pauljensen@chromium.org</owner>
+  <summary>
+    How long was spent connected via an Ethernet connection, before the
+    NetworkChangeNotifier detected a connectivity change.
+
+    This metric is recorded when the NetworkChangeNotifier detects a
+    connectivity change.  This will miss data from users whose connection type
+    never changes and will be biased to users whose connection type changes
+    frequently.
+  </summary>
+</histogram>
+
+<histogram name="NCN.CM.TimeOnNone" units="milliseconds">
+  <owner>pauljensen@chromium.org</owner>
+  <summary>
+    How long was spent disconnected, before the NetworkChangeNotifier detected a
+    connectivity change.
+
+    This metric is recorded when the NetworkChangeNotifier detects a
+    connectivity change.  This will miss data from users whose connection type
+    never changes and will be biased to users whose connection type changes
+    frequently.
+  </summary>
+</histogram>
+
+<histogram name="NCN.CM.TimeOnUnknown" units="milliseconds">
+  <owner>pauljensen@chromium.org</owner>
+  <summary>
+    How long was spent connected via an unknown connection type, before the
+    NetworkChangeNotifier detected a connectivity change.
+
+    This metric is recorded when the NetworkChangeNotifier detects a
+    connectivity change.  This will miss data from users whose connection type
+    never changes and will be biased to users whose connection type changes
+    frequently.
+  </summary>
+</histogram>
+
+<histogram name="NCN.CM.TimeOnWifi" units="milliseconds">
+  <owner>pauljensen@chromium.org</owner>
+  <summary>
+    How long was spent connected via a Wifi connection, before the
+    NetworkChangeNotifier detected a connectivity change.
+
+    This metric is recorded when the NetworkChangeNotifier detects a
+    connectivity change.  This will miss data from users whose connection type
+    never changes and will be biased to users whose connection type changes
+    frequently.
+  </summary>
+</histogram>
+
+<histogram name="NCN.ConnectionTypeChangeToIPAddressChange"
+    units="milliseconds">
+  <owner>pauljensen@chromium.org</owner>
+  <summary>
+    Time from ConnectionTypeChanged message until IPAddressChanged message.
+  </summary>
+</histogram>
+
+<histogram name="NCN.DNSConfigChange" units="milliseconds">
+  <owner>pauljensen@chromium.org</owner>
+  <summary>Time between DNS configuration change messages.</summary>
+</histogram>
+
+<histogram name="NCN.GetConnectionTypeTime" units="milliseconds">
+  <owner>pauljensen@chromium.org</owner>
+  <summary>
+    How long does each call to NetworkChangeNotifier::GetConnectionType() take.
+  </summary>
+</histogram>
+
+<histogram name="NCN.IPAddressChange" units="milliseconds">
+  <owner>pauljensen@chromium.org</owner>
+  <summary>Time between IP address change messages.</summary>
+</histogram>
+
+<histogram name="NCN.IPAddressChangeToConnectionTypeChange"
+    units="milliseconds">
+  <owner>pauljensen@chromium.org</owner>
+  <summary>
+    Time from IPAddressChanged message until ConnectionTypeChanged message.
+  </summary>
+</histogram>
+
+<histogram name="NCN.NetworkOfflineChange" units="milliseconds">
+  <owner>pauljensen@chromium.org</owner>
+  <summary>
+    Time between going online until we go offline change messages, using new
+    filtered signal.
+  </summary>
+</histogram>
+
+<histogram name="NCN.NetworkOnlineChange" units="milliseconds">
+  <owner>pauljensen@chromium.org</owner>
+  <summary>
+    Time between going offline until we go online change messages, using new
+    filtered signal.
+  </summary>
+</histogram>
+
+<histogram name="NCN.NetworkOperatorMCCMNC">
+  <owner>bolian@chromium.org</owner>
+  <owner>bengr@google.com</owner>
+  <owner>marq@google.com</owner>
+  <summary>
+    The MCC (mobile country code) and MNC (mobile network code) of the network
+    operator when a new metrics log is created or when the network connection is
+    changed. A value of zero means a non-mobile network or the operator code is
+    unknown.
+  </summary>
+</histogram>
+
+<histogram name="NCN.OfflineChange" units="milliseconds">
+  <owner>pauljensen@chromium.org</owner>
+  <summary>
+    Time between going online until we go offline change messages.
+  </summary>
+</histogram>
+
+<histogram name="NCN.OfflineDataRecv" units="milliseconds">
+  <owner>pauljensen@chromium.org</owner>
+  <summary>
+    Time between when we thought we went offline and when we received some
+    network data (a URLRequest read completed).
+  </summary>
+</histogram>
+
+<histogram name="NCN.OfflineDataRecvAny5sBeforeOnline">
+  <owner>pauljensen@chromium.org</owner>
+  <summary>
+    Count of how many times we received network data (a URLRequest read
+    completed) while offline when some data was received at most five seconds
+    before going online.
+  </summary>
+</histogram>
+
+<histogram name="NCN.OfflineDataRecvUntilOnline" units="milliseconds">
+  <owner>pauljensen@chromium.org</owner>
+  <summary>
+    Time between when we received the last network data (a URLRequest read
+    completed) while offline and when we thought we went online.
+  </summary>
+</histogram>
+
+<histogram name="NCN.OfflinePolls">
+  <owner>pauljensen@chromium.org</owner>
+  <summary>
+    Count of how many times we polled the online/offline status before detecting
+    an offline to online transition.
+  </summary>
+</histogram>
+
+<histogram name="NCN.OnlineChange" units="milliseconds">
+  <owner>pauljensen@chromium.org</owner>
+  <summary>
+    Time between going offline until we go online change messages.
+  </summary>
+</histogram>
+
+<histogram name="NCN.PollingOfflineDataRecv" units="milliseconds">
+  <owner>pauljensen@chromium.org</owner>
+  <summary>
+    Time between when we thought we went offline and when we received some
+    network data (a URLRequest read completed), while polling
+    NetworkChangeNotifier::GetConnectionType() still told us we were offline.
+  </summary>
+</histogram>
+
+<histogram name="Net.AlternateProtocolBrokenLocation"
+    enum="BrokenAlternateProtocolLocation">
+  <owner>rch@chromium.org</owner>
+  <summary>
+    Breakdown of the locations when SetBrokenAlternateProtocol is called.
+  </summary>
+</histogram>
+
+<histogram name="Net.AlternateProtocolUsage" enum="AlternateProtocolUsage">
+  <owner>rch@chromium.org</owner>
+  <summary>
+    Breakdown of how requests which could potentially make use of an alternate
+    protocol use or don't use the protocol.
+  </summary>
+</histogram>
+
+<histogram name="Net.AlternateProtocolUsage.1000Truncated"
+    enum="AlternateProtocolUsage">
+  <owner>rch@chromium.org</owner>
+  <summary>
+    Breakdown of how requests which could potentially make use of an alternate
+    protocol use or don't use the protocol. Loaded data for 1000 servers and we
+    have persisted 1000 MRU servers.
+  </summary>
+</histogram>
+
+<histogram name="Net.AlternateProtocolUsage.200Truncated"
+    enum="AlternateProtocolUsage">
+  <owner>rch@chromium.org</owner>
+  <summary>
+    Breakdown of how requests which could potentially make use of an alternate
+    protocol use or don't use the protocol. Loaded data for 200 servers and we
+    have persisted 1000 MRU servers.
+  </summary>
+</histogram>
+
 <histogram name="Net.AsyncResourceHandler_PendingDataCount">
   <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
   <summary>
@@ -10534,6 +12475,18 @@ other types of suffix sets.
   </summary>
 </histogram>
 
+<histogram name="Net.CertVerifier_First_Job_Latency" units="milliseconds">
+  <owner>davidben@chromium.org</owner>
+  <summary>
+    The actual amount of time spent verifying a certificate using the underlying
+    cryptographic APIs. Because parallel verifications for the same certificate
+    may be coalesced, histograms such as Net.SSLCertVerificationTime may be
+    skewed, due to later verifications taking less overall time. This records
+    the overall time spent verifying the first job to capture initialization
+    costs.
+  </summary>
+</histogram>
+
 <histogram name="Net.CertVerifier_Job_Latency" units="milliseconds">
   <owner>rsleevi@chromium.org</owner>
   <summary>
@@ -10838,6 +12791,9 @@ other types of suffix sets.
 </histogram>
 
 <histogram name="Net.CountOfPipelineCapableServers">
+  <obsolete>
+    Deprecated 05/2014, related field trial already long expired.
+  </obsolete>
   <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
   <summary>
     The total number of severs that support HTTP pipelining. This counts the
@@ -11336,7 +13292,8 @@ other types of suffix sets.
 </histogram>
 
 <histogram name="Net.ErrorCodesForImages" enum="NetErrorCodes">
-  <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
+  <owner>skonig@chromium.org</owner>
+  <owner>hbengali@chromium.org</owner>
   <summary>
     Net error codes that requests for images end with, including net::OK and
     net:ERR_ABORTED.
@@ -11401,6 +13358,15 @@ other types of suffix sets.
   </summary>
 </histogram>
 
+<histogram name="Net.ErrorPageCounts" enum="NetErrorPageEvents">
+  <owner>rdsmith@chromium.org</owner>
+  <owner>ellyjones@chromium.org</owner>
+  <summary>
+    Counts of various events that can occur on the network error page. See the
+    histogram for details.
+  </summary>
+</histogram>
+
 <histogram name="Net.FileError_Flush">
   <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
   <summary>
@@ -11552,10 +13518,19 @@ other types of suffix sets.
 </histogram>
 
 <histogram name="Net.FtpServerTypeCount" enum="FtpServerType">
+  <obsolete>
+    Replaced by Net.FtpServerTypeCount2 on 2012-11-03.
+  </obsolete>
+  <owner>phajdan.jr@chromium.org</owner>
+  <summary>
+    Each bucket is the number of times the FTP server type was encountered.
+  </summary>
+</histogram>
+
+<histogram name="Net.FtpServerTypeCount2" enum="FtpServerType2">
   <owner>phajdan.jr@chromium.org</owner>
   <summary>
-    Each bucket is the number of FTP server types the user has encountered
-    during the session.
+    Each bucket is the number of times the FTP server type was encountered.
   </summary>
 </histogram>
 
@@ -11616,10 +13591,66 @@ other types of suffix sets.
 </histogram>
 
 <histogram name="Net.HadFtpServerType" enum="FtpServerType">
+  <obsolete>
+    Replaced by Net.HadFtpServerType2 on 2012-11-13.
+  </obsolete>
   <owner>phajdan.jr@chromium.org</owner>
   <summary>
-    Each bucket is a boolean (0 or 1) indicating whether the user has had a
-    connection with an FTP server of that type during the session.
+    Each bucket is the number of sessions that encountered a given FTP server
+    type. Each session reports a given server type at most once.
+  </summary>
+</histogram>
+
+<histogram name="Net.HadFtpServerType2" enum="FtpServerType2">
+  <owner>phajdan.jr@chromium.org</owner>
+  <summary>
+    Each bucket is the number of sessions that encountered a given FTP server
+    type. Each session reports a given server type at most once.
+  </summary>
+</histogram>
+
+<histogram name="Net.HttpAuthCacheAddEvicted" enum="BooleanDidEvict">
+  <owner>ttuttle@chromium.org</owner>
+  <summary>
+    Whether adding an entry to the HTTP auth cache evicted another entry.
+  </summary>
+</histogram>
+
+<histogram name="Net.HttpAuthCacheAddEvictedCreation">
+  <owner>ttuttle@chromium.org</owner>
+  <summary>
+    When an HTTP auth cache entry is evicted, the time since it was created.
+  </summary>
+</histogram>
+
+<histogram name="Net.HttpAuthCacheAddEvictedLastUse">
+  <owner>ttuttle@chromium.org</owner>
+  <summary>
+    When an HTTP auth cache entry is evicted, the time since it was last used.
+  </summary>
+</histogram>
+
+<histogram name="Net.HttpAuthCacheAddPathEvicted" enum="BooleanDidEvict">
+  <owner>ttuttle@chromium.org</owner>
+  <summary>
+    Whether adding a path to an entry in the HTTP auth cache evicted another
+    path.
+  </summary>
+</histogram>
+
+<histogram name="Net.HttpAuthCacheLookupByPathPosition">
+  <owner>ttuttle@chromium.org</owner>
+  <summary>
+    When looking up an HTTP auth cache entry by path, the position (1-indexed)
+    of the entry on a hit, or 0 on a miss.
+  </summary>
+</histogram>
+
+<histogram name="Net.HttpAuthCacheLookupPosition">
+  <owner>ttuttle@chromium.org</owner>
+  <summary>
+    When looking up an HTTP auth cache entry by realm, the position (1-indexed)
+    of the entry on a hit, or 0 on a miss.
   </summary>
 </histogram>
 
@@ -11844,6 +13875,15 @@ other types of suffix sets.
   </summary>
 </histogram>
 
+<histogram name="Net.IOThreadCreationToHttpRequestStart" units="milliseconds">
+  <owner>bengr@chromium.org</owner>
+  <summary>
+    Time from when the IOThread is created to when the first URL request is
+    started. Only requests that are created for a profile while Chrome is
+    starting up are considered.
+  </summary>
+</histogram>
+
 <histogram name="Net.IPv6ConnectDuration" units="milliseconds">
   <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
   <summary>Duration of time spent during the UDP-connect IPv6 probe.</summary>
@@ -11878,6 +13918,18 @@ other types of suffix sets.
   </summary>
 </histogram>
 
+<histogram name="Net.MainFrameNoStore" enum="MainFrameStorable">
+  <owner>jkarlin@chromium.org</owner>
+  <summary>
+    The distribution of storable vs &quot;cache-control: no-store&quot;
+    main-frame resources.
+
+    Counted after response headers have completed and before the content has
+    completed. Redirects are counted. All HTTP cache transactions are counted,
+    not just those that require the network.
+  </summary>
+</histogram>
+
 <histogram name="Net.MTPR_GetProxyForUrl_Thread_Wait_Time" units="milliseconds">
   <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
   <summary>
@@ -12020,7 +14072,10 @@ other types of suffix sets.
 </histogram>
 
 <histogram name="Net.Ping_ResponseStartedTime" units="milliseconds">
-  <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
+  <obsolete>
+    Deprecated 4/16/2014. No longer tracked.
+  </obsolete>
+  <owner>davidben@chromium.org</owner>
   <summary>
     How long it took for an &lt;a ping&gt; request to receive a response. Only
     recorded if a response was received.
@@ -12028,7 +14083,10 @@ other types of suffix sets.
 </histogram>
 
 <histogram name="Net.Ping_Result" enum="PingResult">
-  <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
+  <obsolete>
+    Deprecated 4/16/2014. No longer tracked.
+  </obsolete>
+  <owner>davidben@chromium.org</owner>
   <summary>
     The result of an &lt;a ping&gt; request, whether it received a response or
     timed out or failed for some other reason.
@@ -12228,6 +14286,15 @@ other types of suffix sets.
   </summary>
 </histogram>
 
+<histogram name="Net.ProxyAuthRequested.HasConnection">
+  <owner>rch@chromium.org</owner>
+  <summary>
+    When a PROXY_AUTH_REQUESTED error code is handled in
+    net::HttpStreamFactoryImpl::Job::RunLoop, this is true if connection_ has an
+    associated value.
+  </summary>
+</histogram>
+
 <histogram name="Net.ProxyPollConfigurationTime">
   <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
   <summary>
@@ -12429,8 +14496,15 @@ other types of suffix sets.
   </summary>
 </histogram>
 
+<histogram name="Net.QuicActiveSessions">
+  <owner>rtenneti@chromium.org</owner>
+  <summary>
+    The number of active QUIC sessions before we activate a new QUIC session.
+  </summary>
+</histogram>
+
 <histogram name="Net.QuicEphemeralPortsSuggested">
-  <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
+  <owner>rch@chromium.org</owner>
   <summary>The number of ports suggested per server.</summary>
 </histogram>
 
@@ -12487,7 +14561,7 @@ other types of suffix sets.
 
 <histogram name="Net.QuicSession.21CumulativePacketsReceived"
     units="Received in Ranges">
-  <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
+  <owner>rch@chromium.org</owner>
   <summary>
     This histogram summarizes information about a 21 packet sequence, indicating
     for each of the 21 possible prefixes of this pattern, how many packets were
@@ -12506,7 +14580,7 @@ other types of suffix sets.
 
 <histogram name="Net.QuicSession.6PacketsPatternsReceived"
     units="Binay of Packets ACKed">
-  <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
+  <owner>rch@chromium.org</owner>
   <summary>
     Each of the 64 buckets represents a different binary pattern of 6
     consecutive packets that were received by the client.  The LSB of the bucket
@@ -12531,6 +14605,46 @@ other types of suffix sets.
   </summary>
 </histogram>
 
+<histogram
+    name="Net.QuicSession.ConnectionClose.HandshakeFailureBlackHole.QuicError"
+    enum="QuicErrorCodes">
+  <owner>rch@chromium.org</owner>
+  <summary>
+    The QUIC error which caused a QUIC connection to be closed before the
+    hanshake was confirmed, in the case where no packets were received. This
+    provides a breakdown of the entires in
+    Net.QuicSession.ConnectionClose.HandshakeNotConfirmed.Reason where the value
+    is BLACK_HOLE.
+  </summary>
+</histogram>
+
+<histogram
+    name="Net.QuicSession.ConnectionClose.HandshakeFailureUnknown.QuicError"
+    enum="QuicErrorCodes">
+  <owner>rch@chromium.org</owner>
+  <summary>
+    The QUIC error which caused a QUIC connection to be closed before the
+    hanshake was confirmed, in the case where at least 1 packet was received.
+    This provides a breakdown of the entires in
+    Net.QuicSession.ConnectionClose.HandshakeNotConfirmed.Reason where the value
+    is UNKNOWN.
+  </summary>
+</histogram>
+
+<histogram name="Net.QuicSession.ConnectionClose.HandshakeNotConfirmed.Reason"
+    enum="QuicHandshakeFailureReason">
+  <owner>rch@chromium.org</owner>
+  <summary>The reason a QUIC handshake failed.</summary>
+</histogram>
+
+<histogram
+    name="Net.QuicSession.ConnectionClose.NumOpenStreams.HandshakeTimedOut">
+  <owner>rch@chromium.org</owner>
+  <summary>
+    The number of streams open when a QUIC session crypto handshake timed out.
+  </summary>
+</histogram>
+
 <histogram name="Net.QuicSession.ConnectionClose.NumOpenStreams.TimedOut">
   <owner>rch@chromium.org</owner>
   <summary>The number of streams open when a QUIC session timed out.</summary>
@@ -12571,8 +14685,21 @@ other types of suffix sets.
   </summary>
 </histogram>
 
+<histogram name="Net.QuicSession.ConnectionTypeFromPeer" enum="AddressFamily">
+  <owner>rch@chromium.org</owner>
+  <summary>
+    The IP Address family of this connection, as reported by the server.
+  </summary>
+</histogram>
+
+<histogram name="Net.QuicSession.ConnectionTypeFromSelf" enum="AddressFamily">
+  <owner>rch@chromium.org</owner>
+  <summary>The IP Address family of this connection, as seen locally.</summary>
+</histogram>
+
 <histogram name="Net.QuicSession.CreationError" enum="QuicSessionErrorCodes">
   <owner>jar@chromium.org</owner>
+  <owner>rch@chromium.org</owner>
   <summary>
     Count of errors during attempts to create a QUIC session (before even using
     the session).
@@ -12586,6 +14713,14 @@ other types of suffix sets.
   </summary>
 </histogram>
 
+<histogram name="Net.QuicSession.HandshakeConfirmedTime" units="Milliseconds">
+  <owner>rch@chromium.org</owner>
+  <summary>
+    The elapsed time between starting the crypto handshake, and receiving
+    confirmation from the server.
+  </summary>
+</histogram>
+
 <histogram name="Net.QuicSession.HandshakeRoundTrips" units="RTTs">
   <obsolete>
     see Net.QuicSession.Connect*PortForHTTP*
@@ -12597,6 +14732,28 @@ other types of suffix sets.
   </summary>
 </histogram>
 
+<histogram name="Net.QuicSession.MaxReordering">
+  <owner>rch@chromium.org</owner>
+  <summary>
+    The maximum packet sequence number reordering observed by a QUIC connection.
+  </summary>
+</histogram>
+
+<histogram name="Net.QuicSession.MaxReorderingTime" units="percent">
+  <owner>rch@chromium.org</owner>
+  <summary>
+    The ratio of the maximum reordering time of a QUIC packet to the min rtt.
+  </summary>
+</histogram>
+
+<histogram name="Net.QuicSession.MaxReorderingTimeLongRtt" units="percent">
+  <owner>rch@chromium.org</owner>
+  <summary>
+    The ratio of the maximum reordering time of a QUIC packet to the min rtt,
+    only for those sessions with a min rtt larger than 100 ms.
+  </summary>
+</histogram>
+
 <histogram name="Net.QuicSession.NumOpenStreams">
   <owner>rch@chromium.org</owner>
   <summary>
@@ -12648,7 +14805,7 @@ other types of suffix sets.
 </histogram>
 
 <histogram name="Net.QuicSession.PacketLossRate" units="1/10th Percent">
-  <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
+  <owner>rch@chromium.org</owner>
   <summary>
     The ratio of the number of missing packets, to the maximum packet sequence
     number received,  for QUIC connections longer than 21 packets received via
@@ -12667,7 +14824,20 @@ other types of suffix sets.
 
 <histogram name="Net.QuicSession.PublicResetAddressMismatch"
     enum="QuicAddressMismatch">
-  <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
+  <owner>wtc@chromium.org</owner>
+  <summary>
+    When a public reset packet is received, whether the client IP address and
+    port number in it differ from the client IP address and port number in the
+    ServerHello handshake message. In the comparison, the first address is the
+    one in ServerHello and the second address is the one in public reset. Note:
+    this histogram is obsolete because it failed to treat IPv4-mapped IPv6
+    addresses as IPv4 addresses.
+  </summary>
+</histogram>
+
+<histogram name="Net.QuicSession.PublicResetAddressMismatch2"
+    enum="QuicAddressMismatch">
+  <owner>wtc@chromium.org</owner>
   <summary>
     When a public reset packet is received, whether the client IP address and
     port number in it differ from the client IP address and port number in the
@@ -12713,6 +14883,42 @@ other types of suffix sets.
   </summary>
 </histogram>
 
+<histogram name="Net.QuicSession.StreamFrameDuplicatedLongConnection"
+    units="1/10th Percent">
+  <owner>rch@chromium.org</owner>
+  <summary>
+    The number of stream frames received which were duplicates, out of every
+    1000 stream frames received. Only for QUIC sessions which received at least
+    100 packets.
+  </summary>
+</histogram>
+
+<histogram name="Net.QuicSession.StreamFrameDuplicatedPercentLongConnection">
+  <owner>rch@chromium.org</owner>
+  <summary>
+    The percentage of stream frames received which were duplicates. Only for
+    QUIC sessions which received at least 100 packets.
+  </summary>
+</histogram>
+
+<histogram name="Net.QuicSession.StreamFrameDuplicatedPercentShortConnection">
+  <owner>rch@chromium.org</owner>
+  <summary>
+    The percentage of stream frames received which were duplicates. Only for
+    QUIC sessions which received fewer than 100 packets.
+  </summary>
+</histogram>
+
+<histogram name="Net.QuicSession.StreamFrameDuplicatedShortConnection"
+    units="1/10th Percent">
+  <owner>rch@chromium.org</owner>
+  <summary>
+    The number of stream frames received which were duplicates, out of every
+    1000 stream frames received. Only for QUIC sessions which received fewer
+    than 100 packets.
+  </summary>
+</histogram>
+
 <histogram name="Net.QuicSession.TruncatedAcksReceived">
   <owner>rch@chromium.org</owner>
   <summary>The number of truncated ACK frames received.</summary>
@@ -12812,6 +15018,9 @@ other types of suffix sets.
 </histogram>
 
 <histogram name="Net.SocketReceiveBufferUnchangeable" units="Bytes">
+  <obsolete>
+    Replaced by Net.SocketUnchangeableReceiveBuffer 3/31/2014.
+  </obsolete>
   <owner>jar@chromium.org</owner>
   <summary>
     The size of a socket's receive buffer when the attempt to change it via
@@ -12828,52 +15037,70 @@ other types of suffix sets.
 </histogram>
 
 <histogram name="Net.SocketStream.ConnectionEstablish" units="milliseconds">
-  <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
+  <owner>yhirano@chromium.org</owner>
+  <owner>ricea@chromium.org</owner>
+  <owner>tyoshino@chromium.org</owner>
   <summary>The time from the connection start to connection establish.</summary>
 </histogram>
 
 <histogram name="Net.SocketStream.ConnectionLatency" units="milliseconds">
-  <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
+  <owner>yhirano@chromium.org</owner>
+  <owner>ricea@chromium.org</owner>
+  <owner>tyoshino@chromium.org</owner>
   <summary>The time waiting to be ready to start connecting.</summary>
 </histogram>
 
 <histogram name="Net.SocketStream.ConnectionType"
     enum="SocketStreamConnectionType">
-  <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
+  <owner>yhirano@chromium.org</owner>
+  <owner>ricea@chromium.org</owner>
+  <owner>tyoshino@chromium.org</owner>
   <summary>
     Each bucket is the number of connection type of socket stream.
   </summary>
 </histogram>
 
 <histogram name="Net.SocketStream.Duration" units="milliseconds">
-  <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
+  <owner>yhirano@chromium.org</owner>
+  <owner>ricea@chromium.org</owner>
+  <owner>tyoshino@chromium.org</owner>
   <summary>The time a socket stream was open.</summary>
 </histogram>
 
 <histogram name="Net.SocketStream.ProtocolType" enum="SocketStreamProtocolType">
-  <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
+  <owner>yhirano@chromium.org</owner>
+  <owner>ricea@chromium.org</owner>
+  <owner>tyoshino@chromium.org</owner>
   <summary>
     Each bucket is the number of protocol type on socket stream.
   </summary>
 </histogram>
 
 <histogram name="Net.SocketStream.ReceivedBytes" units="bytes">
-  <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
+  <owner>yhirano@chromium.org</owner>
+  <owner>ricea@chromium.org</owner>
+  <owner>tyoshino@chromium.org</owner>
   <summary>Number of bytes on a socket stream.</summary>
 </histogram>
 
 <histogram name="Net.SocketStream.ReceivedCounts">
-  <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
+  <owner>yhirano@chromium.org</owner>
+  <owner>ricea@chromium.org</owner>
+  <owner>tyoshino@chromium.org</owner>
   <summary>Number of reads on a socket stream.</summary>
 </histogram>
 
 <histogram name="Net.SocketStream.SentBytes" units="bytes">
-  <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
+  <owner>yhirano@chromium.org</owner>
+  <owner>ricea@chromium.org</owner>
+  <owner>tyoshino@chromium.org</owner>
   <summary>Number of bytes on a socket stream.</summary>
 </histogram>
 
 <histogram name="Net.SocketStream.SentCounts">
-  <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
+  <owner>yhirano@chromium.org</owner>
+  <owner>ricea@chromium.org</owner>
+  <owner>tyoshino@chromium.org</owner>
   <summary>Number of Write on a socket stream.</summary>
 </histogram>
 
@@ -12884,6 +15111,14 @@ other types of suffix sets.
   </summary>
 </histogram>
 
+<histogram name="Net.SocketUnchangeableReceiveBuffer" units="Bytes">
+  <owner>jar@chromium.org</owner>
+  <summary>
+    The size of a socket's receive buffer when the attempt to change it via
+    setsockopt failed.
+  </summary>
+</histogram>
+
 <histogram name="Net.SocketUnchangeableSendBuffer" units="Bytes">
   <owner>jar@chromium.org</owner>
   <summary>
@@ -12937,13 +15172,13 @@ other types of suffix sets.
 </histogram>
 
 <histogram name="Net.SpdyConnectionLatency" units="milliseconds">
-  <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
+  <owner>rch@chromium.org</owner>
   <summary>Time from when the Connect() starts until it completes.</summary>
 </histogram>
 
 <histogram name="Net.SpdyFrameStreamAndSessionFlowControlState"
     enum="SpdyFrameFlowControlState">
-  <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
+  <owner>rch@chromium.org</owner>
   <summary>
     The counts of the flow control state of each frame (with stream and session
     flow control on).
@@ -12952,16 +15187,26 @@ other types of suffix sets.
 
 <histogram name="Net.SpdyFrameStreamFlowControlState"
     enum="SpdyFrameFlowControlState">
-  <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
+  <owner>rch@chromium.org</owner>
   <summary>
     The counts of the flow control state of each frame (with stream flow control
     on).
   </summary>
 </histogram>
 
+<histogram name="Net.SpdyHpackEncodedCharacterFrequency" units="ASCII codes">
+  <owner>jgraettinger@chromium.org</owner>
+  <summary>
+    Frequencies of characters observed in request and response headers.
+    Temporarily being collected to inform the construction of an optimized
+    Huffman code for the HTTP/2 specification. Buckets are ASCII codes offset by
+    1.
+  </summary>
+</histogram>
+
 <histogram name="Net.SpdyIPPoolDomainMatch" enum="SpdyIPPoolDomainMatch"
     units="count">
-  <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
+  <owner>rch@chromium.org</owner>
   <summary>
     Status of checking if a SPDY domain can handle a IP match.  If a match is
     found, we successfully used the IP Pooling.  If a match is not found, we
@@ -12971,27 +15216,27 @@ other types of suffix sets.
 </histogram>
 
 <histogram name="Net.SpdyPing.RTT" units="milliseconds">
-  <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
+  <owner>rch@chromium.org</owner>
   <summary>The RTT for SPDY's PING.</summary>
 </histogram>
 
 <histogram name="Net.SpdyPriorityCount">
-  <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
+  <owner>rch@chromium.org</owner>
   <summary>The count of streams at each priority over Spdy sessions.</summary>
 </histogram>
 
 <histogram name="Net.SpdyRecvBytes" units="bytes">
-  <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
+  <owner>rch@chromium.org</owner>
   <summary>The number of bytes recevied per stream.</summary>
 </histogram>
 
 <histogram name="Net.SpdySendBytes" units="bytes">
-  <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
+  <owner>rch@chromium.org</owner>
   <summary>The number of bytes sent per stream.</summary>
 </histogram>
 
 <histogram name="Net.SpdySession.BytesRead.EOF" units="bytes">
-  <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
+  <owner>rch@chromium.org</owner>
   <summary>
     Total number of bytes recevied per session before closing session due to
     EOF.
@@ -12999,7 +15244,7 @@ other types of suffix sets.
 </histogram>
 
 <histogram name="Net.SpdySession.BytesRead.OtherErrors" units="bytes">
-  <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
+  <owner>rch@chromium.org</owner>
   <summary>
     Total number of bytes recevied per session before closing session due to an
     error during read.
@@ -13007,7 +15252,7 @@ other types of suffix sets.
 </histogram>
 
 <histogram name="Net.SpdySession.ClosedOnError" enum="NetErrorCodes">
-  <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
+  <owner>rch@chromium.org</owner>
   <summary>
     Net error codes when SpdySession was closed, doesn't inlcuding net::OK.
   </summary>
@@ -13015,7 +15260,7 @@ other types of suffix sets.
 
 <histogram name="Net.SpdySession.CreateStreamWithSocketConnected"
     enum="BooleanSuccess">
-  <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
+  <owner>rch@chromium.org</owner>
   <summary>Socket connected status in SpdySession::CreateStream.</summary>
 </histogram>
 
@@ -13024,7 +15269,7 @@ other types of suffix sets.
   <obsolete>
     Replaced by SpdySessionErrorDetails2 on 2013-04-19.
   </obsolete>
-  <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
+  <owner>rch@chromium.org</owner>
   <summary>
     WARNING: r181910 added an enum value in the middle, so don't trust the
     counts for values 9 and above for Chrome builds after that revision.
@@ -13035,7 +15280,7 @@ other types of suffix sets.
 
 <histogram name="Net.SpdySessionErrorDetails2" enum="SpdyProtocolErrorDetails2"
     units="count">
-  <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
+  <owner>rch@chromium.org</owner>
   <summary>The type of SPDY Protocol error encountered.</summary>
 </histogram>
 
@@ -13044,7 +15289,7 @@ other types of suffix sets.
   <obsolete>
     Replaced by SpdySessionErrorDetails_Google2 on 2013-04-19.
   </obsolete>
-  <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
+  <owner>rch@chromium.org</owner>
   <summary>
     The type of SPDY Protocol error encountered when talking to a google.com
     server.
@@ -13053,7 +15298,7 @@ other types of suffix sets.
 
 <histogram name="Net.SpdySessionErrorDetails_Google2"
     enum="SpdyProtocolErrorDetails2" units="count">
-  <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
+  <owner>rch@chromium.org</owner>
   <summary>
     WARNING: r181910 added an enum value in the middle, so don't trust the
     counts for values 9 and above for Chrome builds after that revision.
@@ -13064,13 +15309,13 @@ other types of suffix sets.
 </histogram>
 
 <histogram name="Net.SpdySessionGet" enum="SpdySessionGet" units="count">
-  <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
+  <owner>rch@chromium.org</owner>
   <summary>The type of SPDY Session used when looking up a session.</summary>
 </histogram>
 
 <histogram name="Net.SpdySessionGetPeerAddressNotConnected"
     enum="BooleanSuccess">
-  <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
+  <owner>rch@chromium.org</owner>
   <summary>
     Whether SpdySession::Get{Peer,Local}Address was called when the connection
     had no socket.
@@ -13081,6 +15326,7 @@ other types of suffix sets.
     enum="BooleanDataReductionProxy">
   <owner>bengr@chromium.org</owner>
   <owner>bolian@chromium.org</owner>
+  <owner>rch@chromium.org</owner>
   <summary>
     The count of SPDY sessions using the data reduction proxy and the count of
     other SPDY sessions.
@@ -13089,7 +15335,7 @@ other types of suffix sets.
 
 <histogram name="Net.SpdySessionSocketNotConnectedGetLocalAddress"
     enum="BooleanSuccess">
-  <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
+  <owner>rch@chromium.org</owner>
   <summary>
     SpdySession::GetLocalAddress returned ERR_SOCKET_NOT_CONNECTED.
   </summary>
@@ -13097,26 +15343,26 @@ other types of suffix sets.
 
 <histogram name="Net.SpdySessionSocketNotConnectedGetPeerAddress"
     enum="BooleanSuccess">
-  <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
+  <owner>rch@chromium.org</owner>
   <summary>
     SpdySession::GetPeerAddress returned ERR_SOCKET_NOT_CONNECTED.
   </summary>
 </histogram>
 
 <histogram name="Net.SpdySessionsWithStalls">
-  <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
+  <owner>rch@chromium.org</owner>
   <summary>The count of SPDY Sessions with or without stalls.</summary>
 </histogram>
 
 <histogram name="Net.SpdySettingsCwnd" units="packets">
-  <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
+  <owner>rch@chromium.org</owner>
   <summary>
     The congestion window (in pkts) received at the end of a SpdySession.
   </summary>
 </histogram>
 
 <histogram name="Net.SpdySettingsCwndSent" units="packets">
-  <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
+  <owner>rch@chromium.org</owner>
   <summary>
     The congestion window (in pkts) sent at the beginning of a SpdySession.
   </summary>
@@ -13124,31 +15370,31 @@ other types of suffix sets.
 
 <histogram name="Net.SpdySettingsReceived" enum="SpdySettingsReceived"
     units="%">
-  <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
+  <owner>rch@chromium.org</owner>
   <summary>
     Percentage of sessions which received settings from the server.
   </summary>
 </histogram>
 
 <histogram name="Net.SpdySettingsRetransRate" units="%">
-  <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
+  <owner>rch@chromium.org</owner>
   <summary>
     The Download Retransmission Rate (%) received at the end of a SpdySession.
   </summary>
 </histogram>
 
 <histogram name="Net.SpdySettingsRTT" units="milliseconds">
-  <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
+  <owner>rch@chromium.org</owner>
   <summary>The RTT received at the end of a SpdySession.</summary>
 </histogram>
 
 <histogram name="Net.SpdySettingsSent" enum="SpdySettingsSent" units="%">
-  <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
+  <owner>rch@chromium.org</owner>
   <summary>Percentage of sessions which sent settings to the server.</summary>
 </histogram>
 
 <histogram name="Net.SpdyStreamDownloadTime" units="milliseconds">
-  <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
+  <owner>rch@chromium.org</owner>
   <summary>
     The time between receiving the first chunk and the last chunk of data on a
     Spdy stream.
@@ -13156,36 +15402,36 @@ other types of suffix sets.
 </histogram>
 
 <histogram name="Net.SpdyStreamsAbandonedPerSession">
-  <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
+  <owner>rch@chromium.org</owner>
   <summary>
     The number of pushed, but abandoned streams over a single session.
   </summary>
 </histogram>
 
 <histogram name="Net.SpdyStreamsPerSession">
-  <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
+  <owner>rch@chromium.org</owner>
   <summary>The number of streams issued over a single session.</summary>
 </histogram>
 
 <histogram name="Net.SpdyStreamsPushedAndClaimedPerSession">
-  <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
+  <owner>rch@chromium.org</owner>
   <summary>
     The number of pushed, and used streams over a single session.
   </summary>
 </histogram>
 
 <histogram name="Net.SpdyStreamsPushedPerSession">
-  <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
+  <owner>rch@chromium.org</owner>
   <summary>The number of push streams received over a single session.</summary>
 </histogram>
 
 <histogram name="Net.SpdyStreamStallsPerSession">
-  <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
+  <owner>rch@chromium.org</owner>
   <summary>The number of stream stalls per session.</summary>
 </histogram>
 
 <histogram name="Net.SpdyStreamTime" units="milliseconds">
-  <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
+  <owner>rch@chromium.org</owner>
   <summary>
     The time of a Spdy stream.  Measured from sending the first chunk to
     receiving the last chunk of data.
@@ -13193,7 +15439,7 @@ other types of suffix sets.
 </histogram>
 
 <histogram name="Net.SpdyStreamTimeToFirstByte" units="milliseconds">
-  <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
+  <owner>rch@chromium.org</owner>
   <summary>
     The time between sending the request and receiving the first chunk of data
     on a Spdy stream.
@@ -13201,14 +15447,14 @@ other types of suffix sets.
 </histogram>
 
 <histogram name="Net.SpdySynStreamCompressionPercentage">
-  <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
+  <owner>rch@chromium.org</owner>
   <summary>
     The percent compression achieved when compression SYN_STREAM frames.
   </summary>
 </histogram>
 
 <histogram name="Net.SpdyVersion" enum="ProtocolVersion">
-  <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
+  <owner>rch@chromium.org</owner>
   <summary>
     The SPDY protocol version that is used to talk to SPDY servers.
   </summary>
@@ -13614,6 +15860,55 @@ other types of suffix sets.
   <summary>The time spent in closesocket call in UDPSocketWin::Close.</summary>
 </histogram>
 
+<histogram name="Net.WebSocket.DeflateMode"
+    enum="WebSocketNewPerMessageDeflateContextTakeoverMode">
+  <owner>yhirano@chromium.org</owner>
+  <owner>ricea@chromium.org</owner>
+  <owner>tyoshino@chromium.org</owner>
+  <summary>
+    Count the number of WebSockets that accepted permessage-deflate extension
+    for each context take over mode. Used by the new Chromium-based WebSocket
+    implementation.
+  </summary>
+</histogram>
+
+<histogram name="Net.WebSocket.Duration" units="milliseconds">
+  <owner>yhirano@chromium.org</owner>
+  <owner>ricea@chromium.org</owner>
+  <owner>tyoshino@chromium.org</owner>
+  <summary>
+    The time from a WebSocket is successfully opened until it's closed. Used to
+    study how WebSockets are used.
+  </summary>
+</histogram>
+
+<histogram name="Net.WebSocket.ErrorCodes" enum="NetErrorCodes">
+  <owner>yhirano@chromium.org</owner>
+  <owner>ricea@chromium.org</owner>
+  <owner>tyoshino@chromium.org</owner>
+  <summary>
+    Positive net error codes that WebSockets end with, including OK and ABORTED.
+  </summary>
+</histogram>
+
+<histogram name="Net.WebSocket.HandshakeResult"
+    enum="WebSocketNewHandshakeResult">
+  <owner>yhirano@chromium.org</owner>
+  <owner>ricea@chromium.org</owner>
+  <owner>tyoshino@chromium.org</owner>
+  <summary>
+    Results of WebSocket handshakes. Use this histogram as a baseline for
+    investigating feature usage counters.
+  </summary>
+</histogram>
+
+<histogram name="Net.WebSocket.ResponseCode" enum="HttpResponseCode">
+  <owner>yhirano@chromium.org</owner>
+  <owner>ricea@chromium.org</owner>
+  <owner>tyoshino@chromium.org</owner>
+  <summary>All HTTP status codes seen during WebSocket handshakes.</summary>
+</histogram>
+
 <histogram name="Net.Wifi.InterfaceCount">
   <owner>mvanouwerkerk@chromium.org</owner>
   <summary>
@@ -13652,6 +15947,9 @@ other types of suffix sets.
 </histogram>
 
 <histogram name="NetConnectivity.Pipeline.0.NetworkError" enum="NetErrorCodes">
+  <obsolete>
+    Deprecated 05/2014, related field trial already long expired.
+  </obsolete>
   <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
   <summary>
     The network error, if any, of the first pipeline connectivity request.
@@ -13659,6 +15957,9 @@ other types of suffix sets.
 </histogram>
 
 <histogram name="NetConnectivity.Pipeline.0.ResponseCode">
+  <obsolete>
+    Deprecated 05/2014, related field trial already long expired.
+  </obsolete>
   <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
   <summary>
     The HTTP response code, if any, of the first pipeline connectivity response.
@@ -13666,11 +15967,17 @@ other types of suffix sets.
 </histogram>
 
 <histogram name="NetConnectivity.Pipeline.0.Status" enum="HttpPipelineStatus">
+  <obsolete>
+    Deprecated 05/2014, related field trial already long expired.
+  </obsolete>
   <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
   <summary>The result of the first pipeline connectivity request.</summary>
 </histogram>
 
 <histogram name="NetConnectivity.Pipeline.1.NetworkError" enum="NetErrorCodes">
+  <obsolete>
+    Deprecated 05/2014, related field trial already long expired.
+  </obsolete>
   <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
   <summary>
     The network error, if any, of the second pipeline connectivity request.
@@ -13678,6 +15985,9 @@ other types of suffix sets.
 </histogram>
 
 <histogram name="NetConnectivity.Pipeline.1.ResponseCode">
+  <obsolete>
+    Deprecated 05/2014, related field trial already long expired.
+  </obsolete>
   <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
   <summary>
     The HTTP response code, if any, of the second pipeline connectivity
@@ -13686,11 +15996,17 @@ other types of suffix sets.
 </histogram>
 
 <histogram name="NetConnectivity.Pipeline.1.Status" enum="HttpPipelineStatus">
+  <obsolete>
+    Deprecated 05/2014, related field trial already long expired.
+  </obsolete>
   <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
   <summary>The result of the second pipeline connectivity request.</summary>
 </histogram>
 
 <histogram name="NetConnectivity.Pipeline.2.NetworkError" enum="NetErrorCodes">
+  <obsolete>
+    Deprecated 05/2014, related field trial already long expired.
+  </obsolete>
   <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
   <summary>
     The network error, if any, of the third pipeline connectivity request.
@@ -13698,6 +16014,9 @@ other types of suffix sets.
 </histogram>
 
 <histogram name="NetConnectivity.Pipeline.2.ResponseCode">
+  <obsolete>
+    Deprecated 05/2014, related field trial already long expired.
+  </obsolete>
   <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
   <summary>
     The HTTP response code, if any, of the third pipeline connectivity response.
@@ -13705,11 +16024,17 @@ other types of suffix sets.
 </histogram>
 
 <histogram name="NetConnectivity.Pipeline.2.Status" enum="HttpPipelineStatus">
+  <obsolete>
+    Deprecated 05/2014, related field trial already long expired.
+  </obsolete>
   <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
   <summary>The result of the third pipeline connectivity request.</summary>
 </histogram>
 
 <histogram name="NetConnectivity.Pipeline.3.NetworkError" enum="NetErrorCodes">
+  <obsolete>
+    Deprecated 05/2014, related field trial already long expired.
+  </obsolete>
   <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
   <summary>
     The network error, if any, of the fourth pipeline connectivity request.
@@ -13717,6 +16042,9 @@ other types of suffix sets.
 </histogram>
 
 <histogram name="NetConnectivity.Pipeline.3.ResponseCode">
+  <obsolete>
+    Deprecated 05/2014, related field trial already long expired.
+  </obsolete>
   <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
   <summary>
     The HTTP response code, if any, of the fourth pipeline connectivity
@@ -13725,11 +16053,17 @@ other types of suffix sets.
 </histogram>
 
 <histogram name="NetConnectivity.Pipeline.3.Status" enum="HttpPipelineStatus">
+  <obsolete>
+    Deprecated 05/2014, related field trial already long expired.
+  </obsolete>
   <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
   <summary>The result of the fourth pipeline connectivity request.</summary>
 </histogram>
 
 <histogram name="NetConnectivity.Pipeline.4.NetworkError" enum="NetErrorCodes">
+  <obsolete>
+    Deprecated 05/2014, related field trial already long expired.
+  </obsolete>
   <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
   <summary>
     The network error, if any, of the fifth pipeline connectivity request.
@@ -13737,6 +16071,9 @@ other types of suffix sets.
 </histogram>
 
 <histogram name="NetConnectivity.Pipeline.4.ResponseCode">
+  <obsolete>
+    Deprecated 05/2014, related field trial already long expired.
+  </obsolete>
   <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
   <summary>
     The HTTP response code, if any, of the fifth pipeline connectivity response.
@@ -13744,11 +16081,17 @@ other types of suffix sets.
 </histogram>
 
 <histogram name="NetConnectivity.Pipeline.4.Status" enum="HttpPipelineStatus">
+  <obsolete>
+    Deprecated 05/2014, related field trial already long expired.
+  </obsolete>
   <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
   <summary>The result of the fifth pipeline connectivity request.</summary>
 </histogram>
 
 <histogram name="NetConnectivity.Pipeline.5.NetworkError" enum="NetErrorCodes">
+  <obsolete>
+    Deprecated 05/2014, related field trial already long expired.
+  </obsolete>
   <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
   <summary>
     The network error, if any, of the stats pipeline connectivity request.
@@ -13756,6 +16099,9 @@ other types of suffix sets.
 </histogram>
 
 <histogram name="NetConnectivity.Pipeline.5.ResponseCode">
+  <obsolete>
+    Deprecated 05/2014, related field trial already long expired.
+  </obsolete>
   <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
   <summary>
     The HTTP response code, if any, of the stats pipeline connectivity response.
@@ -13763,11 +16109,17 @@ other types of suffix sets.
 </histogram>
 
 <histogram name="NetConnectivity.Pipeline.5.Status" enum="HttpPipelineStatus">
+  <obsolete>
+    Deprecated 05/2014, related field trial already long expired.
+  </obsolete>
   <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
   <summary>The result of the stats pipeline connectivity request.</summary>
 </histogram>
 
 <histogram name="NetConnectivity.Pipeline.AllHTTP11" enum="BooleanSuccess">
+  <obsolete>
+    Deprecated 05/2014, related field trial already long expired.
+  </obsolete>
   <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
   <summary>
     True if all requests received by the pipelining test server were HTTP/1.1.
@@ -13775,6 +16127,9 @@ other types of suffix sets.
 </histogram>
 
 <histogram name="NetConnectivity.Pipeline.CanarySuccess" enum="BooleanSuccess">
+  <obsolete>
+    Deprecated 05/2014, related field trial already long expired.
+  </obsolete>
   <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
   <summary>
     True if the non-pipelined canary request sent immediately before the
@@ -13784,6 +16139,9 @@ other types of suffix sets.
 </histogram>
 
 <histogram name="NetConnectivity.Pipeline.Depth">
+  <obsolete>
+    Deprecated 05/2014, related field trial already long expired.
+  </obsolete>
   <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
   <summary>
     The maximum depth of pipelined requests received by the test server.
@@ -13791,6 +16149,9 @@ other types of suffix sets.
 </histogram>
 
 <histogram name="NetConnectivity.Pipeline.Success" enum="BooleanSuccess">
+  <obsolete>
+    Deprecated 05/2014, related field trial already long expired.
+  </obsolete>
   <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
   <summary>True if the entire pipeline connectivity trial passed.</summary>
 </histogram>
@@ -14392,6 +16753,9 @@ other types of suffix sets.
 
 <histogram name="Network.Shill.Cellular.DHCPOptionFailureDetected"
     enum="NetworkDHCPOptionFailure">
+  <obsolete>
+    Deprecated 5/2014, and replaced by Network.Shill.DHCPOptionFailureDetected.
+  </obsolete>
   <owner>quiche@chromium.org</owner>
   <summary>
     Chrome OS network metric that tracks the number of DHCP option failures
@@ -14553,8 +16917,22 @@ other types of suffix sets.
   </summary>
 </histogram>
 
+<histogram name="Network.Shill.DHCPOptionFailureDetected"
+    enum="NetworkTechnology">
+  <owner>zqiu@chromium.org</owner>
+  <summary>
+    Chrome OS network metric that tracks the number of DHCP option failures
+    encountered by Shill for each network technology.  This indicates that Shill
+    is using minimal DHCP options due to suspected MTU issues on the return path
+    from the DHCP server back to the client.
+  </summary>
+</histogram>
+
 <histogram name="Network.Shill.Ethernet.DHCPOptionFailureDetected"
     enum="NetworkDHCPOptionFailure">
+  <obsolete>
+    Deprecated 5/2014, and replaced by Network.Shill.DHCPOptionFailureDetected.
+  </obsolete>
   <owner>quiche@chromium.org</owner>
   <summary>
     Chrome OS network metric that tracks the number of DHCP option failures
@@ -14702,6 +17080,14 @@ other types of suffix sets.
   <summary>Chrome OS connection manager service errors seen.</summary>
 </histogram>
 
+<histogram name="Network.Shill.ServicesOnSameNetwork">
+  <owner>zqiu@chromium.org</owner>
+  <summary>
+    Chrome OS network metric sampling the number of services that are connected
+    to the currently connected network.
+  </summary>
+</histogram>
+
 <histogram name="Network.Shill.TerminationActionResult"
     enum="ShillTerminationActionResult">
   <obsolete>
@@ -14760,6 +17146,13 @@ other types of suffix sets.
   </summary>
 </histogram>
 
+<histogram name="Network.Shill.UserInitiatedEvents" enum="UserInitiatedEvent">
+  <owner>zqiu@chromium.org</owner>
+  <summary>
+    Chrome OS network metric that tracks the number of user-initiated events.
+  </summary>
+</histogram>
+
 <histogram name="Network.Shill.Vpn.Driver" enum="VPNDriver">
   <owner>quiche@chromium.org</owner>
   <summary>
@@ -14838,6 +17231,22 @@ other types of suffix sets.
   </summary>
 </histogram>
 
+<histogram name="Network.Shill.WiFi.AutoConnectableServices">
+  <owner>zqiu@chromium.org</owner>
+  <summary>
+    Chrome OS network metric sampling the number of wifi services available for
+    auto-connect when auto-connect is initiated for wifi device.
+  </summary>
+</histogram>
+
+<histogram name="Network.Shill.WiFi.AvailableBSSesAtConnect">
+  <owner>zqiu@chromium.org</owner>
+  <summary>
+    Chrome OS network metric sampling the number of BSSes (endpoints) available
+    for the currently connecting wifi service.
+  </summary>
+</histogram>
+
 <histogram name="Network.Shill.Wifi.Channel" enum="NetworkChannelType">
   <owner>quiche@chromium.org</owner>
   <summary>
@@ -14865,6 +17274,9 @@ other types of suffix sets.
 
 <histogram name="Network.Shill.Wifi.DHCPOptionFailureDetected"
     enum="NetworkDHCPOptionFailure">
+  <obsolete>
+    Deprecated 5/2014, and replaced by Network.Shill.DHCPOptionFailureDetected.
+  </obsolete>
   <owner>quiche@chromium.org</owner>
   <summary>
     Chrome OS network metric that tracks the number of DHCP option failures
@@ -14908,6 +17320,16 @@ other types of suffix sets.
   </summary>
 </histogram>
 
+<histogram name="Network.Shill.Wifi.FallbackDNSTestResult"
+    enum="FallbackDNSTestResult">
+  <owner>zqiu@chromium.org</owner>
+  <summary>
+    Chrome OS network performance metric that tracks the result of the fallback
+    DNS test. The fallback DNS test is performed when portal detection failed
+    due to DNS failure.
+  </summary>
+</histogram>
+
 <histogram name="Network.Shill.WiFi.FrequenciesConnectedEver">
   <owner>quiche@chromium.org</owner>
   <summary>
@@ -15118,8 +17540,29 @@ other types of suffix sets.
   </summary>
 </histogram>
 
+<histogram name="Network.Shill.WiFi.TransmitBitrateMbps" units="Mbps">
+  <owner>zqiu@chromium.org</owner>
+  <summary>
+    Chrome OS network performance metric that tracks the transmit bitrate in
+    Mbps for the wifi device when it is connected to a network. The bitrate is
+    reported once every minute after the wifi connection is established.
+  </summary>
+</histogram>
+
+<histogram name="Network.Shill.WiFi.UserInitiatedConnectionResult"
+    enum="ConnectionResult">
+  <owner>zqiu@chromium.org</owner>
+  <summary>
+    Chrome OS network performance metric that tracks the result of
+    user-initiated wifi connection attempts.
+  </summary>
+</histogram>
+
 <histogram name="Network.Shill.WiMax.DHCPOptionFailureDetected"
     enum="NetworkDHCPOptionFailure">
+  <obsolete>
+    Deprecated 5/2014, and replaced by Network.Shill.DHCPOptionFailureDetected.
+  </obsolete>
   <owner>quiche@chromium.org</owner>
   <summary>
     Chrome OS network metric that tracks the number of DHCP option failures
@@ -15379,6 +17822,9 @@ other types of suffix sets.
 
 <histogram name="NewTabPage.BookmarkActionAndroid"
     enum="NewTabPageBookmarkActionAndroid">
+  <obsolete>
+    Deprecated on M33 with the change to native NTP.
+  </obsolete>
   <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
   <summary>
     Actions taken by users on partner bookmarks (editing / renaming) on the NTP
@@ -15408,6 +17854,9 @@ other types of suffix sets.
 </histogram>
 
 <histogram name="NewTabPage.MobilePromo" enum="NewTabPageMobilePromo">
+  <obsolete>
+    Deprecated on M33 with the change to native NTP.
+  </obsolete>
   <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
   <summary>
     Android: Tallies counts for how the user interacted with the NTP promo page.
@@ -15919,12 +18368,34 @@ other types of suffix sets.
 
 <histogram name="Omnibox.FocusToOpenTime" units="ms">
   <owner>mpearson@chromium.org</owner>
+  <obsolete>
+    Replaced with Omnibox.FocusToOpenTimeAnyPopupState in April 2014.
+  </obsolete>
   <summary>
     The length of time between when a user focused on the omnibox and opened an
     omnibox match (which could be what they typed or a suggestion).
   </summary>
 </histogram>
 
+<histogram name="Omnibox.FocusToOpenTimeAnyPopupState" units="ms">
+  <owner>mpearson@chromium.org</owner>
+  <summary>
+    The length of time between when a user focused on the omnibox and opened an
+    omnibox match (which could be what they typed or a suggestion).  This is
+    recorded regardless of whether the omnibox dropdown (a.k.a. popup) is open.
+  </summary>
+</histogram>
+
+<histogram name="Omnibox.HasLegalDefaultMatchWithoutCompletion" enum="Boolean">
+  <owner>mpearson@chromium.org</owner>
+  <summary>
+    Whether there was at least one legal default match without an
+    |inline_autocompletion|.  Recorded every time
+    AutocompleteResult::SortAndCull() is called, which could happen multiple
+    times on each keystroke.
+  </summary>
+</histogram>
+
 <histogram name="Omnibox.Paste" units="count">
   <owner>mpearson@chromium.org</owner>
   <summary>
@@ -15967,6 +18438,14 @@ other types of suffix sets.
   </summary>
 </histogram>
 
+<histogram name="Omnibox.SaveStateForTabSwitch.UserInputInProgress"
+    units="count">
+  <owner>mpearson@chromium.org</owner>
+  <summary>
+    When a user switches tabs, whether the omnibox had an edit in progress.
+  </summary>
+</histogram>
+
 <histogram name="Omnibox.SearchEngine" enum="OmniboxSearchEngine">
   <obsolete>
     Made obsolete around Chrome 32.  Use Omnibox.SearchEngineType instead.
@@ -16024,6 +18503,7 @@ other types of suffix sets.
 </histogram>
 
 <histogram name="Omnibox.UserTextCleared" enum="OmniboxUserTextCleared">
+  <owner>kenjibaheux@chromium.org</owner>
   <owner>mpearson@chromium.org</owner>
   <summary>
     Counts the number of times that the user text is cleared.  IME users are
@@ -16260,6 +18740,15 @@ other types of suffix sets.
   </summary>
 </histogram>
 
+<histogram name="PasswordBubble.DisplayDisposition"
+    enum="PasswordBubbleDisplayDisposition">
+  <owner>mkwst@chromium.org</owner>
+  <owner>markusheintz@chromium.org</owner>
+  <summary>
+    When the password management bubble opened, what state was it in?
+  </summary>
+</histogram>
+
 <histogram name="PasswordGeneration.Event" enum="PasswordGenerationEvent">
   <owner>gcasto@chromium.org</owner>
   <summary>
@@ -16495,6 +18984,15 @@ other types of suffix sets.
   </summary>
 </histogram>
 
+<histogram name="PasswordManager.UIDismissalReason"
+    enum="PasswordManagerUIDismissalReason">
+  <owner>mkwst@chromium.org</owner>
+  <owner>markusheintz@chromium.org</owner>
+  <summary>
+    Why was the password manager's UI (bubble or infobar) closed?
+  </summary>
+</histogram>
+
 <histogram name="Pepper.InterfaceUsed" enum="PepperInterface">
   <owner>mackinlay@google.com</owner>
   <owner>teravest@chromium.org</owner>
@@ -16953,6 +19451,15 @@ other types of suffix sets.
   <summary>Chrome OS stateful partition usage level.</summary>
 </histogram>
 
+<histogram name="Platform.Storage.Flash.BadBlocks">
+  <owner>dehrenberg@chromium.org</owner>
+  <summary>
+    The number of blocks marked bad in an MTD partition. This is relevant for
+    devices with raw NAND flash, such as Chromecast. Sampled once daily, if the
+    Chromecast is on for any significant length of time in the day.
+  </summary>
+</histogram>
+
 <histogram name="Platform.SwapInLong" units="pages/second">
   <owner>sonnyrao@chromium.org</owner>
   <summary>
@@ -17841,6 +20348,51 @@ other types of suffix sets.
   </summary>
 </histogram>
 
+<histogram name="Platform.ZramCompressedSize" units="MB">
+  <owner>semenzato@google.com</owner>
+  <summary>
+    Compressed swap size in megabytes.  This is the actual amount of RAM used by
+    the system to compress memory (i.e. after compression).  Snapshot every 30s.
+  </summary>
+</histogram>
+
+<histogram name="Platform.ZramCompressionRatioPercent" units="%">
+  <owner>semenzato@google.com</owner>
+  <summary>
+    The ratio of compressed memory (zram) before and after compression when the
+    denominator at least 1 MB. Ratios of interest are between 1 and 6 (typically
+    between 2 and 3), and we express them as a percentage (between 100% and
+    600%). The size of memory before compression includes zero-filled pages.
+    Values close to 100% indicate low compression effectiveness. Snapshot every
+    30s.
+  </summary>
+</histogram>
+
+<histogram name="Platform.ZramSavings" units="MB">
+  <owner>semenzato@google.com</owner>
+  <summary>
+    RAM savings in megabytes from using memory compression.  This is the
+    difference between the RAM size before and after compression.  Snapshot
+    every 30s.
+  </summary>
+</histogram>
+
+<histogram name="Platform.ZramZeroPages" units="pages">
+  <owner>semenzato@google.com</owner>
+  <summary>
+    Number of zero-filled pages that the OS is compressing.  A large number
+    suggests wasteful allocation.  Snapshot every 30s.
+  </summary>
+</histogram>
+
+<histogram name="Platform.ZramZeroRatioPercent" units="%">
+  <owner>semenzato@google.com</owner>
+  <summary>
+    The fraction of compressed memory that consists of zero-filled pages.
+    Snapshot every 30s.
+  </summary>
+</histogram>
+
 <histogram name="PlatformFile.UnknownCreateFileErrors" units="code">
   <obsolete>
     Deprecated as of 2013-05, replaced by
@@ -18272,6 +20824,17 @@ other types of suffix sets.
   </summary>
 </histogram>
 
+<histogram name="Plugin.AvailabilityStatus.WidevineCdm"
+    enum="PluginAvailabilityStatus">
+  <owner>xhwang@chromium.org</owner>
+  <summary>
+    The availability status of Widevine CDM. In normal cases, this is reported
+    per render process if EME API is used. This is not reported if EME API is
+    not used. This could be reported multiple times per render process until
+    PLUGIN_AVAILABLE is reported (which should be a rare case).
+  </summary>
+</histogram>
+
 <histogram name="Plugin.FlashNavigateUsage" enum="FlashNavigateUsageType">
   <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
   <summary>Record usage of PPB_Flash.Navigate() Pepper API.</summary>
@@ -19017,6 +21580,9 @@ other types of suffix sets.
 </histogram>
 
 <histogram name="Prerender.NetworkBytes.TotalForProfile" units="bytes">
+  <obsolete>
+    Deprecated May 13th 2014, use Prerender.NetworkBytesTotalForProfile instead.
+  </obsolete>
   <owner>dmikurube@chromium.org</owner>
   <owner>jkarlin@chromium.org</owner>
   <summary>
@@ -19030,6 +21596,9 @@ other types of suffix sets.
 </histogram>
 
 <histogram name="Prerender.NetworkBytes.Used" units="bytes">
+  <obsolete>
+    Deprecated May 13th 2014, use Prerender.NetworkBytes.Used instead.
+  </obsolete>
   <owner>dmikurube@chromium.org</owner>
   <owner>jkarlin@chromium.org</owner>
   <summary>
@@ -19040,6 +21609,41 @@ other types of suffix sets.
 </histogram>
 
 <histogram name="Prerender.NetworkBytes.Wasted" units="bytes">
+  <obsolete>
+    Deprecated May 13th 2014, use Prerender.NetworkBytes.Wasted instead.
+  </obsolete>
+  <owner>dmikurube@chromium.org</owner>
+  <owner>jkarlin@chromium.org</owner>
+  <summary>
+    Number of bytes transferred on the network for URLRequests (not including
+    HTTP/TLS/TCP/IP overhead) for a prerender that was not used.
+  </summary>
+</histogram>
+
+<histogram name="Prerender.NetworkBytesTotalForProfile" units="bytes">
+  <owner>dmikurube@chromium.org</owner>
+  <owner>jkarlin@chromium.org</owner>
+  <summary>
+    Number of bytes transferred on the network for URLRequests (not including
+    HTTP/TLS/TCP/IP overhead).  Reported on event of a PrerenderContents
+    deletion.  Includes prerender bytes.  Bytes are only counted when
+    prerendering is enabled and not in a control group.  The sum of the
+    distribution for a single user represents all of that user's network
+    transfers for resource for that time period while prerendering was enabled.
+  </summary>
+</histogram>
+
+<histogram name="Prerender.NetworkBytesUsed" units="bytes">
+  <owner>dmikurube@chromium.org</owner>
+  <owner>jkarlin@chromium.org</owner>
+  <summary>
+    Number of bytes transferred on the network for URLRequests (not including
+    HTTP/TLS/TCP/IP overhead) for a prerender that was used (or would have been
+    used).
+  </summary>
+</histogram>
+
+<histogram name="Prerender.NetworkBytesWasted" units="bytes">
   <owner>dmikurube@chromium.org</owner>
   <owner>jkarlin@chromium.org</owner>
   <summary>
@@ -19789,6 +22393,15 @@ other types of suffix sets.
   <summary>The frequency of ways that new user profiles are added.</summary>
 </histogram>
 
+<histogram name="Profile.AndroidAccountManagementMenu"
+    enum="ProfileAndroidAccountManagementMenu">
+  <owner>aruslan@chromium.org</owner>
+  <summary>
+    Track user interactions that can be performed in the Android account
+    management menu.
+  </summary>
+</histogram>
+
 <histogram name="Profile.AppCount">
   <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
   <summary>The number of installed apps when a profile is opened.</summary>
@@ -19867,6 +22480,26 @@ other types of suffix sets.
   </summary>
 </histogram>
 
+<histogram name="Profile.Delete" enum="BooleanProfileSignedIn">
+  <owner>mlerman@chromium.org</owner>
+  <summary>
+    The user used the settings page to delete a profile. Please note this
+    histogram tracks the user interaction, and not the actual delete of the
+    profile, which can happen much later. The parameter indicates if the profile
+    was signed in or not; true means the profile was signed in, false means the
+    profile was not signed in.
+  </summary>
+</histogram>
+
+<histogram name="Profile.DesktopMenu" enum="ProfileDesktopMenu">
+  <owner>mlerman@chromium.org</owner>
+  <summary>
+    Track user interactions that can be performed in the user menu and user
+    manager. The origin of the action, whether the an interaction in the content
+    area or some other source, is noted in the histogram suffix.
+  </summary>
+</histogram>
+
 <histogram name="Profile.ExtensionSize" units="MB">
   <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
   <summary>Size of the extension cookies database.</summary>
@@ -19891,6 +22524,16 @@ other types of suffix sets.
   </summary>
 </histogram>
 
+<histogram name="Profile.LockedProfilesDuration" units="minutes">
+  <owner>mlerman@chromium.org</owner>
+  <summary>
+    How long locked profiles have been locked for. This is logged each time any
+    profile is loaded. Note that this does not track the total time the profile
+    was locked, but rather the span from when the profile was locked to when the
+    measurement takes place.
+  </summary>
+</histogram>
+
 <histogram name="Profile.NetUserCount" enum="ProfileNetUserCount">
   <owner>bcwhite@chromium.org</owner>
   <owner>rlp@chromium.org</owner>
@@ -19900,6 +22543,15 @@ other types of suffix sets.
   </summary>
 </histogram>
 
+<histogram name="Profile.NumberOfAccountsPerProfile">
+  <owner>mlerman@chromium.org</owner>
+  <summary>
+    Counts the number of Google-managed accounts linked to a profile. This may
+    be counted multiple times per profile. Please review with the &quot;Show
+    user counts&quot; option enabled on the dashboard.
+  </summary>
+</histogram>
+
 <histogram name="Profile.NumberOfManagedProfiles">
   <owner>pam@chromium.org</owner>
   <summary>
@@ -19945,7 +22597,7 @@ other types of suffix sets.
   <owner>rlp@chromium.org</owner>
   <summary>
     Counts the number of signed-in profiles on a user's machine when Chrome
-    starts up, among cases with at least one profile.
+    starts up.
   </summary>
 </histogram>
 
@@ -19961,6 +22613,15 @@ other types of suffix sets.
   </summary>
 </histogram>
 
+<histogram name="Profile.NumberOfSignedInProfilesWithGAIAIcons">
+  <owner>mlerman@chromium.org</owner>
+  <summary>
+    Counts the number of signed-in profiles that are using the GAIA image as the
+    avatar icon. This is counted when a profile is loaded, including when Chrome
+    starts up.
+  </summary>
+</histogram>
+
 <histogram name="Profile.Opening" enum="ProfileOpen">
   <obsolete>
     Deprecated because it did not present the information clearly.
@@ -20096,6 +22757,15 @@ other types of suffix sets.
   <summary>Times a profile name and/or avatar was updated.</summary>
 </histogram>
 
+<histogram name="Profile.UpgradeEnrollment" enum="ProfileUpgradeEnrollment">
+  <owner>mlerman@chromium.org</owner>
+  <summary>
+    The process which leads a user to enroll in New Profile Management. Also
+    tracks if the user chooses to opt out, and tutorials which guide the user
+    into New Profile Management.
+  </summary>
+</histogram>
+
 <histogram name="Profile.VisitedLinksSize" units="MB">
   <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
   <summary>Size of the visited links database.</summary>
@@ -20301,14 +22971,19 @@ other types of suffix sets.
 </histogram>
 
 <histogram name="Rappor.DiscardReason" enum="RapporDiscardReason">
-  <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
+  <owner>holte@chromium.org</owner>
   <summary>
     For each Rappor log that is discarded, the reason that it was discarded.
   </summary>
 </histogram>
 
+<histogram name="Rappor.FailedUploadErrorCode" enum="NetErrorCodes">
+  <owner>holte@chromium.org</owner>
+  <summary>Net error codes for failed Rappor uploads.</summary>
+</histogram>
+
 <histogram name="Rappor.UploadResponseCode" enum="HttpResponseCode">
-  <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
+  <owner>holte@chromium.org</owner>
   <summary>
     For each upload to the Rappor server, log the response received from the
     server.
@@ -20475,6 +23150,9 @@ other types of suffix sets.
 </histogram>
 
 <histogram name="Renderer4.AccelContentPaintDurationMS">
+  <obsolete>
+    Deprecated 2014-05 because of impl-side painting.
+  </obsolete>
   <owner>wiltzius@chromium.org</owner>
   <summary>
     Time spent by WebKit painting the page, in milliseconds, when the GPU
@@ -20483,6 +23161,9 @@ other types of suffix sets.
 </histogram>
 
 <histogram name="Renderer4.AccelContentPaintMegapixPerSecond">
+  <obsolete>
+    Deprecated 2014-05 because of impl-side painting.
+  </obsolete>
   <owner>wiltzius@chromium.org</owner>
   <summary>
     WebKit paint throughput, measured in megapixels per second, when GPU
@@ -20602,6 +23283,17 @@ other types of suffix sets.
   </summary>
 </histogram>
 
+<histogram name="Renderer4.CompositorScrollHitTestResult"
+    enum="CompositorScrollResult">
+  <owner>vollick@chromium.org</owner>
+  <summary>
+    It's possible for compositor hit testing to determine conclusively that
+    compositor thread scrolling can or cannot be done. It's also possible that
+    the hit testing result is inconclusive. We would like to see the I-don't-
+    know result as little as possible. This histogram tracks the ratios.
+  </summary>
+</histogram>
+
 <histogram name="Renderer4.CompositorThreadImplDrawDelay" units="milliseconds">
   <owner>wiltzius@chromium.org</owner>
   <summary>
@@ -20665,6 +23357,40 @@ other types of suffix sets.
   </summary>
 </histogram>
 
+<histogram name="Renderer4.GpuRasterizationEnabled" units="BooleanEnabled">
+  <owner>alokp@chromium.org</owner>
+  <summary>
+    Whether gpu rasterization is enabled (checked once after the page is painted
+    for the first time).
+  </summary>
+</histogram>
+
+<histogram name="Renderer4.GpuRasterizationSuitableContent"
+    units="BooleanEnabled">
+  <owner>alokp@chromium.org</owner>
+  <summary>
+    If gpu rasterization is enabled, whether the page contents are suitable for
+    gpu rasterization (checked once after the page is painted for the first
+    time).
+  </summary>
+</histogram>
+
+<histogram name="Renderer4.GpuRasterizationTriggered" units="BooleanEnabled">
+  <owner>alokp@chromium.org</owner>
+  <summary>
+    If gpu rasterization is enabled, whether it was triggered (checked once
+    after the page is painted for the first time).
+  </summary>
+</histogram>
+
+<histogram name="Renderer4.GpuRasterizationUsed" units="BooleanEnabled">
+  <owner>alokp@chromium.org</owner>
+  <summary>
+    If gpu rasterization is enabled, whether it was actually used for the page
+    (checked once after the page is painted for the first time).
+  </summary>
+</histogram>
+
 <histogram name="Renderer4.InvalidationRegionApproximateRectCount"
     units="rects">
   <owner>wiltzius@chromium.org</owner>
@@ -20995,6 +23721,14 @@ other types of suffix sets.
   </summary>
 </histogram>
 
+<histogram name="SafeBrowsing.EnabledSettingChanged" enum="BooleanEnabled">
+  <owner>feng@chromium.org</owner>
+  <summary>
+    Records the user action that enables/disables safe browsing feature in the
+    Settings page on Android.
+  </summary>
+</histogram>
+
 <histogram name="SB.BloomFilter" units="milliseconds">
   <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
   <summary>
@@ -21309,6 +24043,15 @@ other types of suffix sets.
   <summary>Records results of SafeBrowsing download url check.</summary>
 </histogram>
 
+<histogram name="SB2.ExtendedReportingIsEnabled" enum="BooleanEnabled">
+  <owner>felt@chromium.org</owner>
+  <summary>
+    Whether the user has Safe Browsing extended reporting enabled at the time a
+    Safe Browsing warning was dismissed.  This tracks the fraction of all SB
+    interstitials that had reporting enabled.
+  </summary>
+</histogram>
+
 <histogram name="SB2.FailedUpdate">
   <obsolete>
     Deprecated, replaced by SB2.DatabaseFailure BROWSE_DB_UPDATE_FINISH.
@@ -21383,10 +24126,10 @@ other types of suffix sets.
 </histogram>
 
 <histogram name="SB2.FormatEvent" enum="SB2FormatEvent">
-  <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
+  <owner>shess@chromium.org</owner>
   <summary>
-    Tracks events involved in upgrading safe-browsing data from SQLite format to
-    new file format.
+    Collection of boolean events for SafeBrowsingFileStore instances.  Includes
+    corruptions detected, old versions detected, and various failures detected.
   </summary>
 </histogram>
 
@@ -21411,28 +24154,30 @@ other types of suffix sets.
 </histogram>
 
 <histogram name="SB2.GetHashResult" enum="SB2GetHashResult">
-  <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
+  <owner>mattm@chromium.org</owner>
   <summary>
-    Track return status from GetHash requests to server (STATUS_200 and
-    STATUS_204), and dispensation of returned values (EMPTY, HIT, MISS).  EMPTY
-    means the response had no full hashes, and should contain all of the 204
-    responses plus those 200 responses corrosponding to items deleted on the
-    server but not yet deleted on the client.  HIT means that one of the full
+    Track return status from GetHash attempts (STATUS_200, STATUS_204,
+    NETWORK_ERROR, HTTP_ERROR, BACKOFF_ERROR), whether parsing a 200 result
+    failed (PARSE_ERROR), and dispensation of returned values (EMPTY, HIT,
+    MISS).  EMPTY means the response had no full hashes, and should contain all
+    of the 204 responses plus all *_ERROR cases.  HIT means that one of the full
     hashes matched. MISS means that none of the hashes matched (there was a
-    prefix collision).
+    prefix collision). (PARSE_ERROR, NETWORK_ERROR, HTTP_ERROR, and
+    BACKOFF_ERROR were added in M36.)
   </summary>
 </histogram>
 
 <histogram name="SB2.GetHashResultDownload" enum="SB2GetHashResult">
-  <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
+  <owner>mattm@chromium.org</owner>
   <summary>
-    Track return status from GetHash requests to server (STATUS_200 and
-    STATUS_204), and dispensation of returned values (EMPTY, HIT, MISS).  EMPTY
-    means the response had no full hashes, and should contain all of the 204
-    responses plus those 200 responses corrosponding to items deleted on the
-    server but not yet deleted on the client.  HIT means that one of the full
+    Track return status from GetHash attempts (STATUS_200, STATUS_204,
+    NETWORK_ERROR, HTTP_ERROR, BACKOFF_ERROR), whether parsing a 200 result
+    failed (PARSE_ERROR), and dispensation of returned values (EMPTY, HIT,
+    MISS).  EMPTY means the response had no full hashes, and should contain all
+    of the 204 responses plus all *_ERROR cases.  HIT means that one of the full
     hashes matched. MISS means that none of the hashes matched (there was a
-    prefix collision).
+    prefix collision). (PARSE_ERROR, NETWORK_ERROR, HTTP_ERROR, and
+    BACKOFF_ERROR were added in M36.)
   </summary>
 </histogram>
 
@@ -21547,6 +24292,14 @@ other types of suffix sets.
   <summary>Size of v1 database deleted from client profile.</summary>
 </histogram>
 
+<histogram name="SB2.OutShardShifts">
+  <owner>shess@chromium.org</owner>
+  <summary>
+    Indicates how sharded safe-browsing on-disk stores are.  Values like 0 to 4
+    are reasonable.
+  </summary>
+</histogram>
+
 <histogram name="SB2.PhishingInterstitialTimeClosed" units="milliseconds">
   <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
   <summary>
@@ -21690,12 +24443,20 @@ other types of suffix sets.
   </summary>
 </histogram>
 
+<histogram name="SB2.PrefixSetVersionRead">
+  <owner>shess@chromium.org</owner>
+  <summary>Version read from the PrefixSet file.</summary>
+</histogram>
+
 <histogram name="SB2.PrefixSetWrite" units="ms">
   <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
   <summary>Time to store the PrefixSet file.</summary>
 </histogram>
 
 <histogram name="SB2.ReportingIsEnabled" enum="BooleanEnabled">
+  <obsolete>
+    Deprecated 06/2014.  Replaced by SB2.ExtendedReportingIsEnabled.
+  </obsolete>
   <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
   <summary>
     Whether the user has Safe Browsing extended reporting enabled at the time a
@@ -21704,7 +24465,18 @@ other types of suffix sets.
   </summary>
 </histogram>
 
+<histogram name="SB2.SetExtendedReportingEnabled" enum="BooleanEnabled">
+  <owner>felt@chromium.org</owner>
+  <summary>
+    Tracks changes to the Safe Browsing extended reporting opt-in which is shown
+    in the Safe Browsing interstitial.
+  </summary>
+</histogram>
+
 <histogram name="SB2.SetReportingEnabled" enum="BooleanEnabled">
+  <obsolete>
+    Deprecated 06/2014.  Replaced by SB2.SetExtendedReportingEnabled.
+  </obsolete>
   <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
   <summary>
     Tracks changes to the Safe Browsing extended reporting opt-in which is shown
@@ -21746,6 +24518,11 @@ other types of suffix sets.
   <summary>The instantiation status of the SideEffectFreeWhitelist.</summary>
 </histogram>
 
+<histogram name="SB2.StoreVersionRead">
+  <owner>shess@chromium.org</owner>
+  <summary>Version read from the store file.</summary>
+</histogram>
+
 <histogram name="SB2.SubPrefixes">
   <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
   <summary>
@@ -21776,11 +24553,39 @@ other types of suffix sets.
   <summary>The size of all the chunk URLs in an update response.</summary>
 </histogram>
 
+<histogram name="SB2.UpdateSizeBackground" units="bytes">
+  <owner>feng@chromium.org</owner>
+  <summary>
+    The size of all the chunk URLs in an update response when Chrome is in the
+    foreground.
+  </summary>
+</histogram>
+
+<histogram name="SB2.UpdateSizeForeground" units="bytes">
+  <owner>feng@chromium.org</owner>
+  <summary>
+    The size of all the chunk URLs in an update response when Chrome is in the
+    background.
+  </summary>
+</histogram>
+
 <histogram name="SB2.UpdateUrls">
   <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
   <summary>The number of chunk URLs in an update response.</summary>
 </histogram>
 
+<histogram name="SB2.VolunteerPrefixesRemoved">
+  <owner>shess@chromium.org</owner>
+  <summary>
+    Older versions of the safe-browsing code incorrectly added additional
+    SBPrefix items when receiving full hashes.  This caused errors when
+    calculating when to send gethash requests to the server.  An additional pass
+    over the data has been added to remove the excess prefixes.  This histogram
+    tracks progress of that code for purposes of informing a decision on when to
+    remove the additional pass.  See http://crbug.com/361248 .
+  </summary>
+</histogram>
+
 <histogram name="SBClientDownload.CheckDownloadStats"
     enum="SBClientDownloadCheckDownloadStats">
   <owner>mattm@chromium.org</owner>
@@ -21803,8 +24608,11 @@ other types of suffix sets.
   <owner>mattm@chromium.org</owner>
   <summary>
     Records the total time it takes for the SafeBrowsing download service to
-    check whether the content of a download is malicious or not. This histogram
-    only includes requests that are sent to the SafeBrowsing server.
+    check whether the content of a download is malicious or not, including file
+    feature extraction, whitelist checking, and server ping. This histogram only
+    includes checks that sent a ping to the SafeBrowsing server. It does not
+    include requests that were cancelled, but does include requests that
+    received a bad response.
   </summary>
 </histogram>
 
@@ -21815,6 +24623,24 @@ other types of suffix sets.
   </summary>
 </histogram>
 
+<histogram name="SBClientDownload.DownloadRequestNetworkDuration"
+    units="milliseconds">
+  <owner>mattm@chromium.org</owner>
+  <summary>
+    Records the time it takes for the SafeBrowsing download service ping. It is
+    not recorded for requests that were cancelled.
+  </summary>
+</histogram>
+
+<histogram name="SBClientDownload.DownloadRequestNetworkStats"
+    enum="SBClientDownloadCheckDownloadStats">
+  <owner>mattm@chromium.org</owner>
+  <summary>
+    Records the results of SafeBrowsing binary download checks which caused a
+    server ping.
+  </summary>
+</histogram>
+
 <histogram name="SBClientDownload.DownloadRequestPayloadSize" units="bytes">
   <owner>mattm@chromium.org</owner>
   <summary>
@@ -21830,6 +24656,27 @@ other types of suffix sets.
   </summary>
 </histogram>
 
+<histogram name="SBClientDownload.DownloadRequestTimeoutDuration"
+    units="milliseconds">
+  <owner>mattm@chromium.org</owner>
+  <summary>
+    Records the portion of the SafeBrowsing download service check starting with
+    the point CheckClientDownloadRequest::StartTimeout() is called. It is
+    recorded regardless if a ping was sent or not. It is not recorded for
+    requests that were cancelled.
+  </summary>
+</histogram>
+
+<histogram name="SBClientDownload.DownloadRequestTimeoutStats"
+    enum="SBClientDownloadCheckDownloadStats">
+  <owner>mattm@chromium.org</owner>
+  <summary>
+    For SafeBrowsing binary download checks which reached the
+    CheckClientDownloadRequest::StartTimeout() call, records the final result
+    (once the check finishes or is cancelled).
+  </summary>
+</histogram>
+
 <histogram name="SBClientDownload.ExtractImageHeadersTime" units="milliseconds">
   <owner>grt@chromium.org</owner>
   <summary>
@@ -21943,6 +24790,9 @@ other types of suffix sets.
 
 <histogram name="SBClientMalware.UnexpectedPageId" enum="BooleanHit">
   <owner>noelutz@chromium.org</owner>
+  <obsolete>
+    Deprecated 03/2014.  That part of the code got deleted.
+  </obsolete>
   <summary>
     Counts the number of times the page ID that completed the page load does not
     match the browse info page ID.  We expect that number to be zero.
@@ -22047,7 +24897,10 @@ other types of suffix sets.
 </histogram>
 
 <histogram name="SBClientPhishing.InitPrivateNetworksFailed">
-  <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
+  <obsolete>
+    Deprecated in Chrome 37, which now uses //net's internal matching.
+  </obsolete>
+  <owner>mattm@chromium.org</owner>
   <summary>
     The number of times that the phishing detection service could not be
     initialized due to an error parsing the private IP networks.  This would
@@ -22228,6 +25081,79 @@ other types of suffix sets.
   </summary>
 </histogram>
 
+<histogram name="SBIRS.DroppedIncident" enum="IncidentType">
+  <owner>grt@google.com</owner>
+  <summary>
+    The type of incident given to the safe browsing incident reporting service
+    but dropped as a result of not participating in safe browsing.
+  </summary>
+</histogram>
+
+<histogram name="SBIRS.EnvCollectionTime" units="milliseconds">
+  <owner>grt@google.com</owner>
+  <summary>
+    The elapsed time to collect environmental data for a safe browsing incident
+    report.
+  </summary>
+</histogram>
+
+<histogram name="SBIRS.FindDownloadedBinaryTime" units="milliseconds">
+  <owner>grt@google.com</owner>
+  <summary>
+    The elapsed time to find the most recent binary download from all loaded
+    profiles when creating a safe browsing incident report.
+  </summary>
+</histogram>
+
+<histogram name="SBIRS.Incident" enum="IncidentType">
+  <owner>grt@google.com</owner>
+  <summary>
+    The type of incident given to the safe browsing incident reporting service.
+  </summary>
+</histogram>
+
+<histogram name="SBIRS.IncidentCount">
+  <owner>grt@google.com</owner>
+  <summary>
+    The number of incidents collated into a single safe browsing incident report
+    before pruning.
+  </summary>
+</histogram>
+
+<histogram name="SBIRS.InterIncidentTime" units="milliseconds">
+  <owner>grt@google.com</owner>
+  <summary>
+    The elapsed time between two successive incidents collated into the same
+    incident report by the safe browsing incident reporting service.
+  </summary>
+</histogram>
+
+<histogram name="SBIRS.PruneRatio" units="percentage">
+  <owner>grt@google.com</owner>
+  <summary>
+    The percentage of incidents pruned from a safe browsing incident report on
+    account of having been previously reported.
+  </summary>
+</histogram>
+
+<histogram name="SBIRS.ReportPayloadSize" units="bytes">
+  <owner>grt@google.com</owner>
+  <summary>The size, in bytes, of a safe browsing incident report.</summary>
+</histogram>
+
+<histogram name="SBIRS.ReportUploadTime" units="milliseconds">
+  <owner>grt@google.com</owner>
+  <summary>The elapsed time to upload a safe browsing incident report.</summary>
+</histogram>
+
+<histogram name="SBIRS.UploadResult" enum="ReportProcessingResult">
+  <owner>grt@google.com</owner>
+  <summary>
+    The result of an attempted report upload by the safe browsing incident
+    reporting service.
+  </summary>
+</histogram>
+
 <histogram name="Search.ContextualSearchOptCard"
     enum="ContextualSearchOptCardAction">
   <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
@@ -22280,7 +25206,17 @@ other types of suffix sets.
   <summary>
     The type of the default search engine that is loaded when a profile is
     opened or after a profile reset.  Note that at least one profile is opened
-    on startup.
+    on startup. Due to an error, there was a period from roughly May 9 2014 to
+    May 23 2014 during which this was not being logged.
+  </summary>
+</histogram>
+
+<histogram name="Search.MigratedPrefToDictionaryValue" enum="BooleanHit">
+  <owner>erikwright@chromium.org</owner>
+  <summary>
+    The number of times that a user-selected DSE was migrated from separate
+    String/List/..Value preferences to the new single DictionaryValue used in
+    M36.
   </summary>
 </histogram>
 
@@ -22293,6 +25229,51 @@ other types of suffix sets.
   </summary>
 </histogram>
 
+<histogram name="ServiceWorker.Database.OpenResult"
+    enum="ServiceWorkerDatabaseStatus">
+  <owner>nhiroki@chromium.org</owner>
+  <summary>
+    Records result of opening a database for ServiceWorkerDatabase.
+  </summary>
+</histogram>
+
+<histogram name="ServiceWorker.Database.ReadResult"
+    enum="ServiceWorkerDatabaseStatus">
+  <owner>nhiroki@chromium.org</owner>
+  <summary>Records result of read operations in ServiceWorkerDatabase.</summary>
+</histogram>
+
+<histogram name="ServiceWorker.Database.WriteResult"
+    enum="ServiceWorkerDatabaseStatus">
+  <owner>nhiroki@chromium.org</owner>
+  <summary>
+    Records result of write operations in ServiceWorkerDatabase.
+  </summary>
+</histogram>
+
+<histogram name="ServiceWorker.DiskCache.InitResult">
+  <owner>nhiroki@chromium.org</owner>
+  <summary>
+    Records result of opening a disk cache for ServiceWorkerDiskCache.
+  </summary>
+</histogram>
+
+<histogram name="ServiceWorker.DiskCache.ReadResponseResult"
+    enum="ServiceWorkerReadResponseResult">
+  <owner>nhiroki@chromium.org</owner>
+  <summary>
+    Records result of reading response from ServiceWorkerDiskCache.
+  </summary>
+</histogram>
+
+<histogram name="ServiceWorker.DiskCache.WriteResponseResult"
+    enum="ServiceWorkerWriteResponseResult">
+  <owner>nhiroki@chromium.org</owner>
+  <summary>
+    Records result of writing response into ServiceWorkerDiskCache.
+  </summary>
+</histogram>
+
 <histogram name="Settings.DefaultSearchProvider" enum="OmniboxSearchEngine">
   <obsolete>
     Deprecated in Chrome 30.  Use Search.DefaultSearchProviderType instead.
@@ -22408,6 +25389,15 @@ other types of suffix sets.
   </summary>
 </histogram>
 
+<histogram name="Settings.MigratedHashesFromLocalState" enum="BooleanMigrated">
+  <owner>csharp@chromium.org</owner>
+  <owner>gab@chromium.org</owner>
+  <summary>
+    Whether, while loading a profile, any preference hashes were migrated from
+    Local State to either Preferences or Protected Preferences.
+  </summary>
+</histogram>
+
 <histogram name="Settings.PinnedTabEngineTypes" enum="OmniboxSearchEngineType">
   <owner>mpearson@chromium.org</owner>
   <summary>
@@ -22566,6 +25556,9 @@ other types of suffix sets.
 
 <histogram name="Settings.TrackedPreferencesAlternateStoreVersion"
     enum="PrefHashStoreVersion">
+  <obsolete>
+    Deprecated 2014-06.
+  </obsolete>
   <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
   <summary>
     The version of a PrefHashStore, reported once for each alternate
@@ -22576,6 +25569,9 @@ other types of suffix sets.
 
 <histogram name="Settings.TrackedPreferencesAlternateStoreVersionUpdatedFrom"
     enum="PrefHashStoreVersion">
+  <obsolete>
+    Deprecated 2014-06.
+  </obsolete>
   <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
   <summary>
     The previous version of an alternate PrefHashStore (not associated to the
@@ -22651,6 +25647,63 @@ other types of suffix sets.
   </summary>
 </histogram>
 
+<histogram name="SharedWorker.RendererSurviveForWorkerTime"
+    units="milliseconds">
+  <owner>horo@chromium.org</owner>
+  <summary>
+    A survival time of RenderProcessHostImpl for the In-renderer Shared Worker
+    from when FastShutdownIfPossible() is called.
+  </summary>
+</histogram>
+
+<histogram name="SharedWorker.TimeToDeleted" units="milliseconds">
+  <owner>horo@chromium.org</owner>
+  <summary>
+    The lifetime of a SharedWorkerHost. This roughly corresponds to the lifetime
+    of SharedWorker.
+  </summary>
+</histogram>
+
+<histogram name="SharedWorker.TimeToScriptLoaded" units="milliseconds">
+  <owner>horo@chromium.org</owner>
+  <summary>
+    The time from the creation of SharedWorkerHost until when WorkerScriptLoaded
+    is called.
+  </summary>
+</histogram>
+
+<histogram name="SharedWorker.TimeToScriptLoadFailed" units="milliseconds">
+  <owner>horo@chromium.org</owner>
+  <summary>
+    The time from the creation of SharedWorkerHost until when
+    WorkerScriptLoadFailed is called.
+  </summary>
+</histogram>
+
+<histogram name="ShortcutsProvider.QueryIndexTime" units="milliseconds">
+  <owner>davidben@chromium.org</owner>
+  <summary>
+    The time it takes for the ShortcutsProvider to perform a query after the
+    user has typed N characters.
+  </summary>
+</histogram>
+
+<histogram name="Signin" enum="SigninHelperFlow">
+  <owner>mlerman@chromium.org</owner>
+  <summary>
+    Tracks user interactions as they sign in through a flow. The suffix of the
+    histogram indicates what UI widget or application flow triggered the signin
+    flow.
+  </summary>
+</histogram>
+
+<histogram name="Signin.AddAccount" enum="BooleanSuccess">
+  <owner>mlerman@chromium.org</owner>
+  <summary>
+    Track when chrome successfully adds an account. Failures are not tracked.
+  </summary>
+</histogram>
+
 <histogram name="Signin.OneClickConfirmation" enum="SigninFlowConfirmations">
   <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
   <summary>
@@ -22659,6 +25712,36 @@ other types of suffix sets.
   </summary>
 </histogram>
 
+<histogram name="Signin.Reconciler.AddedToChrome">
+  <owner>mlerman@chromium.org</owner>
+  <summary>
+    After the first execution of the account reconciler, how many accounts were
+    added to the browser's token service because they were in the cookie jar.
+  </summary>
+</histogram>
+
+<histogram name="Signin.Reconciler.AddedToCookieJar">
+  <owner>mlerman@chromium.org</owner>
+  <summary>
+    After the first execution of the account reconciler, how many accounts were
+    added to the cookie jar because they were in the browser's token service.
+  </summary>
+</histogram>
+
+<histogram name="Signin.Reconciler.DifferentPrimaryAccounts"
+    enum="DifferentPrimaryAccounts">
+  <owner>mlerman@chromium.org</owner>
+  <summary>
+    After execution of the account reconcilor, compares the primary account in
+    the token service to the primary GAIA account of the cookie jar.
+  </summary>
+</histogram>
+
+<histogram name="Signin.SignoutProfile" enum="SigninSignoutProfile">
+  <owner>mlerman@chromium.org</owner>
+  <summary>Track how a profile gets signed out.</summary>
+</histogram>
+
 <histogram name="SimpleCache.App.CheckCRCResult" enum="CheckCRCResult">
   <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
   <summary>
@@ -24977,6 +28060,47 @@ other types of suffix sets.
   <summary>The outcome of Entry::WriteData in the simple cache.</summary>
 </histogram>
 
+<histogram name="SimpleGeolocation.Request.Event"
+    enum="SimpleGeolocationRequestEvent">
+  <owner>alemate@chromium.org</owner>
+  <summary>Events in reqests processing of IP-based SimpleGeolocation.</summary>
+</histogram>
+
+<histogram name="SimpleGeolocation.Request.ResponseCode"
+    enum="HttpResponseCode">
+  <owner>alemate@chromium.org</owner>
+  <summary>Http response codes in IP-based SimpleGeolocation.</summary>
+</histogram>
+
+<histogram name="SimpleGeolocation.Request.ResponseFailureTime"
+    units="milliseconds">
+  <owner>alemate@chromium.org</owner>
+  <summary>
+    The time elapsed between the sending of the first API request and the time
+    the final (failed) response was recorded. Includes all retries.
+  </summary>
+</histogram>
+
+<histogram name="SimpleGeolocation.Request.ResponseSuccessTime"
+    units="milliseconds">
+  <owner>alemate@chromium.org</owner>
+  <summary>
+    The time elapsed between the sending of the first API request and the time
+    the final (successfull) response was recorded. Includes all retries.
+  </summary>
+</histogram>
+
+<histogram name="SimpleGeolocation.Request.Result"
+    enum="SimpleGeolocationRequestResult">
+  <owner>alemate@chromium.org</owner>
+  <summary>Result of SimpleGeolocationRequest.</summary>
+</histogram>
+
+<histogram name="SimpleGeolocation.Request.Retries">
+  <owner>alemate@chromium.org</owner>
+  <summary>Number of retries until the final response was recorded.</summary>
+</histogram>
+
 <histogram name="SiteIsolation.AllResponses">
   <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
   <summary>
@@ -25430,6 +28554,18 @@ other types of suffix sets.
   </summary>
 </histogram>
 
+<histogram name="SoftwareReporter.ExitCode" enum="SwReporterExitCode">
+  <owner>mad@chromium.org</owner>
+  <summary>The exit code from the execution of the software reporter.</summary>
+</histogram>
+
+<histogram name="SoftwareReporter.Step" enum="SwReporterStep">
+  <owner>mad@chromium.org</owner>
+  <summary>
+    The registration and execution steps for the software reporter.
+  </summary>
+</histogram>
+
 <histogram name="SpellCheck.SpellingService.Enabled" enum="BooleanEnabled">
   <owner>groby@chromium.org</owner>
   <owner>rlp@chromium.org</owner>
@@ -25602,6 +28738,25 @@ other types of suffix sets.
   <summary>Error codes returned by sqlite the web db.</summary>
 </histogram>
 
+<histogram name="Startup.AppListFirstPaintColdStart" units="milliseconds">
+  <owner>tapted@chromium.org</owner>
+  <summary>
+    Time for a newly created browser process to perform the first paint of the
+    app launcher, when started with the --show-app-list flag and with no
+    currently running Chrome processes.
+  </summary>
+</histogram>
+
+<histogram name="Startup.AppListFirstPaintWarmStart" units="milliseconds">
+  <owner>tapted@chromium.org</owner>
+  <summary>
+    Time for a running browser process to perform the first paint of the app
+    launcher. Measured from the time a second Chrome process started, which sent
+    its --show-app-list command line argument to the already-running process and
+    will soon exit.
+  </summary>
+</histogram>
+
 <histogram name="Startup.BrowserMessageLoopStartTime">
   <owner>jeremy@chromium.org</owner>
   <summary>
@@ -25826,6 +28981,14 @@ other types of suffix sets.
   </summary>
 </histogram>
 
+<histogram name="StartupTimeBomb.Alarm" units="milliseconds">
+  <owner>rtenneti@chromium.org</owner>
+  <summary>
+    Time duration measured from the time the startup timebomb was started and
+    when it went off.
+  </summary>
+</histogram>
+
 <histogram name="Suggestions.FailedRequestErrorCode" enum="NetErrorCodes">
   <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
   <summary>
@@ -27098,6 +30261,15 @@ other types of suffix sets.
   </summary>
 </histogram>
 
+<histogram name="SyncFileSystem.RegisterOriginTime" units="milliseconds">
+  <owner>peria@chromium.org</owner>
+  <owner>tzik@chromium.org</owner>
+  <summary>
+    Time elapsed to register a Chrome App to SyncFilesystem. Recorded for each
+    registration request by apps.
+  </summary>
+</histogram>
+
 <histogram name="SyncFileSystem.TrackerNumber">
   <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
   <summary>
@@ -27118,6 +30290,16 @@ other types of suffix sets.
   </summary>
 </histogram>
 
+<histogram name="Tab.BackgroundLoadStatus" enum="TabBackgroundLoadStatus">
+  <owner>ppi@chromium.org</owner>
+  <summary>
+    Mobile-specific metric: when a tab that was opened in background (via
+    &quot;Open link in new tab&quot;) is switched to, we record whether the
+    eagerly loaded tab was still memory resident, or we lost the loaded page due
+    to memory pressure.
+  </summary>
+</histogram>
+
 <histogram name="Tab.FormActivityCountEvictedHistogram">
   <owner>lliabraa@chromium.org</owner>
   <summary>
@@ -27197,6 +30379,9 @@ other types of suffix sets.
 
 <histogram name="Tab.SwitchedToForegroundLaunchedWithURL"
     enum="TabSwitchedToForegroundLaunchedWithURL">
+  <obsolete>
+    Deprecated as of 04/2014.
+  </obsolete>
   <owner>lliabraa@chromium.org</owner>
   <summary>
     Each time a tab is brought to the foreground, this histogram indicates if
@@ -27206,6 +30391,9 @@ other types of suffix sets.
 </histogram>
 
 <histogram name="Tab.SwitchedToForegroundMRURank">
+  <obsolete>
+    Deprecated as of 04/2014.
+  </obsolete>
   <owner>lliabraa@chromium.org</owner>
   <summary>
     Rank in MRU order (0 being first) when the tab was switched to foreground.
@@ -27219,6 +30407,9 @@ other types of suffix sets.
 
 <histogram name="Tab.SwitchedToForegroundRevisit"
     enum="TabSwitchedToForegroundRevisit">
+  <obsolete>
+    Deprecated as of 04/2014.
+  </obsolete>
   <owner>lliabraa@chromium.org</owner>
   <summary>
     Each time a tab is brought to the foreground, this histogram indicates if
@@ -27926,6 +31117,476 @@ other types of suffix sets.
   </summary>
 </histogram>
 
+<histogram name="UpdateEngine.Attempt.ConnectionType"
+    enum="UpdateEngineConnectionType">
+  <owner>zeuthen@chromium.org</owner>
+  <summary>
+    The network connection type when the attempt begins. Possible values include
+    &quot;Unknown&quot;, &quot;Ethernet&quot;, &quot;Wifi&quot;,
+    &quot;Wimax&quot;, &quot;Bluetooth&quot;, &quot;Cellular&quot;,
+    &quot;Tethered Ethernet&quot;, &quot;Tethered Wifi&quot;.
+
+    This is reported when an update attempt ends.
+
+    This metric is specific to ChromeOS.
+  </summary>
+</histogram>
+
+<histogram name="UpdateEngine.Attempt.DownloadErrorCode"
+    enum="UpdateEngineDownloadErrorCode">
+  <owner>zeuthen@chromium.org</owner>
+  <summary>
+    A more detailed description of the last Payload transfer error when
+    downloading the payload.
+
+    This is reported when an attempt ends with the &quot;Payload Download
+    Error&quot; result.
+
+    This metric is specific to ChromeOS.
+  </summary>
+</histogram>
+
+<histogram name="UpdateEngine.Attempt.DownloadSource"
+    enum="UpdateEngineDownloadSource">
+  <owner>zeuthen@chromium.org</owner>
+  <summary>
+    The download source used, possible values include &quot;HTTPS Server&quot;,
+    &quot;HTTP Server&quot; and &quot;HTTP Peer&quot;.
+
+    This is reported when an update attempt ends.
+
+    This metric is specific to ChromeOS.
+  </summary>
+</histogram>
+
+<histogram name="UpdateEngine.Attempt.DurationMinutes" units="minutes">
+  <owner>zeuthen@chromium.org</owner>
+  <summary>
+    The number of minutes the update attempt took including the time the device
+    spent sleeping.
+
+    This is reported when an update attempt ends.
+
+    This metric is specific to ChromeOS.
+  </summary>
+</histogram>
+
+<histogram name="UpdateEngine.Attempt.DurationUptimeMinutes" units="minutes">
+  <owner>zeuthen@chromium.org</owner>
+  <summary>
+    The number of minutes the update attempt took excluding the time the device
+    spent sleeping.
+
+    This is reported when an update attempt ends.
+
+    This metric is specific to ChromeOS.
+  </summary>
+</histogram>
+
+<histogram name="UpdateEngine.Attempt.InternalErrorCode"
+    enum="UpdateEngineErrorCode">
+  <owner>zeuthen@chromium.org</owner>
+  <summary>
+    A more detailed description of the last internal error. The possible values
+    correspond to the ErrorCode enumeration in the update_engine source code.
+
+    This is reported when an attempt ends with the InternalError result.
+
+    This metric is specific to ChromeOS.
+  </summary>
+</histogram>
+
+<histogram name="UpdateEngine.Attempt.Number" units="count">
+  <owner>zeuthen@chromium.org</owner>
+  <summary>
+    The attempt number which starts at 0 for the initial attempt and keeps
+    increasing for subsequent attempts.
+
+    This is reported when an update attempt ends.
+
+    This metric is specific to ChromeOS.
+  </summary>
+</histogram>
+
+<histogram name="UpdateEngine.Attempt.PayloadBytesDownloadedMiB" units="MiB">
+  <owner>zeuthen@chromium.org</owner>
+  <summary>
+    The number of payload mebibytes (1048576 bytes) actually download.
+
+    This is reported when an update attempt ends.
+
+    This metric is specific to ChromeOS.
+  </summary>
+</histogram>
+
+<histogram name="UpdateEngine.Attempt.PayloadDownloadSpeedKBps" units="KBps">
+  <owner>zeuthen@chromium.org</owner>
+  <summary>
+    The payload download speed, in kilobytes per second (1000 bytes/second).
+    This is calculated as the number of bytes downloaded divided by the duration
+    of the attempt (excluding time spent sleeping).
+
+    This is reported when an update attempt ends.
+
+    This metric is specific to ChromeOS.
+  </summary>
+</histogram>
+
+<histogram name="UpdateEngine.Attempt.PayloadSizeMiB" units="MiB">
+  <owner>zeuthen@chromium.org</owner>
+  <summary>
+    The payload size, in mebibytes (1048576 bytes).
+
+    This is reported when an update attempt ends.
+
+    This metric is specific to ChromeOS.
+  </summary>
+</histogram>
+
+<histogram name="UpdateEngine.Attempt.PayloadType"
+    enum="UpdateEnginePayloadFormat">
+  <owner>zeuthen@chromium.org</owner>
+  <summary>
+    The payload type, possible values include &quot;Delta&quot; (if Omaha
+    specified to download a delta payload); and &quot;Full&quot; (if Omaha
+    specified to download a full payload); and &quot;ForcedFull&quot; (if the
+    client specified that it would only accept a full payload).
+
+    This is reported when an update attempt ends.
+
+    This metric is specific to ChromeOS.
+  </summary>
+</histogram>
+
+<histogram name="UpdateEngine.Attempt.Result" enum="UpdateEngineAttemptResult">
+  <owner>zeuthen@chromium.org</owner>
+  <summary>
+    The result of the update attempt.
+
+    This is reported when an update attempt ends.
+
+    This metric is specific to ChromeOS.
+  </summary>
+</histogram>
+
+<histogram name="UpdateEngine.Attempt.TimeSinceLastAttemptMinutes"
+    units="minutes">
+  <owner>zeuthen@chromium.org</owner>
+  <summary>
+    The number of minutes since the last attempt including the time the device
+    spent sleeping.
+
+    This is reported when an update attempt ends but only if there was a
+    previous attempt for the same update.
+
+    This metric is specific to ChromeOS.
+  </summary>
+</histogram>
+
+<histogram name="UpdateEngine.Attempt.TimeSinceLastAttemptUptimeMinutes"
+    units="minutes">
+  <owner>zeuthen@chromium.org</owner>
+  <summary>
+    The number of minutes since the last attempt excluding the time the device
+    spent sleeping.
+
+    This is reported when an update attempt ends but only if there was a
+    previous attempt for the same update.
+
+    This metric is specific to ChromeOS.
+  </summary>
+</histogram>
+
+<histogram name="UpdateEngine.Check.DownloadErrorCode"
+    enum="UpdateEngineDownloadErrorCode">
+  <owner>zeuthen@chromium.org</owner>
+  <summary>
+    If unable to download a response from Omaha, a more detailed error code is
+    reported in this metric.
+
+    This is reported on every update check resulting in &quot;Download
+    error&quot;.
+
+    This metric is specific to ChromeOS.
+  </summary>
+</histogram>
+
+<histogram name="UpdateEngine.Check.Reaction" enum="UpdateEngineCheckReaction">
+  <owner>zeuthen@chromium.org</owner>
+  <summary>
+    If there is an update available, this metric will track what the device does
+    with the information. Possible values include &quot;Applying update&quot;,
+    &quot;Deferring update&quot;, &quot;Ignoring update&quot;, and &quot;Backing
+    off&quot;.
+
+    This is reported on update checks resulting in &quot;Update available&quot;.
+
+    This metric is specific to ChromeOS.
+  </summary>
+</histogram>
+
+<histogram name="UpdateEngine.Check.Result" enum="UpdateEngineCheckResult">
+  <owner>zeuthen@chromium.org</owner>
+  <summary>
+    The response from Omaha. Possible values include &quot;No update
+    available&quot;, &quot;Update available&quot;, &quot;Download error&quot;,
+    &quot;Response parsing error&quot;, and &quot;Reboot pending&quot;.
+
+    This is reported on every update check.
+
+    This metric is specific to ChromeOS.
+  </summary>
+</histogram>
+
+<histogram name="UpdateEngine.Check.TimeSinceLastCheckMinutes" units="minutes">
+  <owner>zeuthen@chromium.org</owner>
+  <summary>
+    The number of minutes since the last check including the time the device
+    spent sleeping.
+
+    This is reported on every update check except for the first one.
+
+    This metric is specific to ChromeOS.
+  </summary>
+</histogram>
+
+<histogram name="UpdateEngine.Check.TimeSinceLastCheckUptimeMinutes"
+    units="minutes">
+  <owner>zeuthen@chromium.org</owner>
+  <summary>
+    The number of minutes since the last check excluding the time the device
+    spent sleeping.
+
+    This is reported on every update check except for the first one.
+
+    This metric is specific to ChromeOS.
+  </summary>
+</histogram>
+
+<histogram name="UpdateEngine.Daily.OSAgeDays" units="days">
+  <owner>zeuthen@chromium.org</owner>
+  <summary>
+    The age of the OS in days, defined as the age of the /etc/lsb-release file.
+
+    This is reported on every update check but at most once a day.
+
+    This metric is specific to ChromeOS.
+  </summary>
+</histogram>
+
+<histogram name="UpdateEngine.FailedUpdateCount" units="count">
+  <owner>zeuthen@chromium.org</owner>
+  <summary>
+    The number of consecutive times a device has failed to boot an update that
+    successfully applied.
+
+    This is reported every time the firmware fails to boot the slot with the
+    update and fell back to the slot it originally updated from.
+
+    This metric is specific to ChromeOS.
+  </summary>
+</histogram>
+
+<histogram name="UpdateEngine.InstallDateProvisioningSource"
+    enum="UpdateEngineInstallDateProvisioningSource">
+  <owner>zeuthen@chromium.org</owner>
+  <summary>
+    The source used to provision the install-date-days value sent to Omaha with
+    every request.
+
+    This is reported when OOBE (Out Of Box Experience) completes (M34 or later)
+    or when upgrading to a version with install-date-days support.
+
+    This metric is specific to ChromeOS.
+  </summary>
+</histogram>
+
+<histogram name="UpdateEngine.Rollback.Result" enum="BooleanSuccess">
+  <owner>zeuthen@chromium.org</owner>
+  <summary>
+    Whether rollback worked.
+
+    This is reported every time there's a rollback request.
+
+    This metric is specific to ChromeOS.
+  </summary>
+</histogram>
+
+<histogram name="UpdateEngine.SuccessfulUpdate.AttemptCount" units="count">
+  <owner>zeuthen@chromium.org</owner>
+  <summary>
+    The total number of update attempts required to update the device.
+
+    This is reported on every successful update.
+
+    This metric is specific to ChromeOS.
+  </summary>
+</histogram>
+
+<histogram name="UpdateEngine.SuccessfulUpdate.BytesDownloadedMiB" units="MiB">
+  <owner>zeuthen@chromium.org</owner>
+  <summary>
+    The total number of bytes downloaded in mebibytes (1048576 bytes) using all
+    available sources (e.g. HTTP, HTTPS, HTTP Peer).
+
+    This is reported on every successful update.
+
+    This metric is specific to ChromeOS.
+  </summary>
+</histogram>
+
+<histogram name="UpdateEngine.SuccessfulUpdate.BytesDownloadedMiBHttpPeer"
+    units="MiB">
+  <owner>zeuthen@chromium.org</owner>
+  <summary>
+    The total number of bytes downloaded in mebibytes (1048576 bytes) using HTTP
+    from a local peer.
+
+    This is reported on every successful update.
+
+    This metric is specific to ChromeOS.
+  </summary>
+</histogram>
+
+<histogram name="UpdateEngine.SuccessfulUpdate.BytesDownloadedMiBHttpServer"
+    units="MiB">
+  <owner>zeuthen@chromium.org</owner>
+  <summary>
+    The total number of bytes downloaded in mebibytes (1048576 bytes) using
+    HTTP.
+
+    This is reported on every successful update.
+
+    This metric is specific to ChromeOS.
+  </summary>
+</histogram>
+
+<histogram name="UpdateEngine.SuccessfulUpdate.BytesDownloadedMiBHttpsServer"
+    units="MiB">
+  <owner>zeuthen@chromium.org</owner>
+  <summary>
+    The total number of bytes downloaded in mebibytes (1048576 bytes) using
+    HTTPS.
+
+    This is reported on every successful update.
+
+    This metric is specific to ChromeOS.
+  </summary>
+</histogram>
+
+<histogram name="UpdateEngine.SuccessfulUpdate.DownloadOverheadPercentage"
+    units="%">
+  <owner>zeuthen@chromium.org</owner>
+  <summary>
+    The ratio between bytes downloaded and payload size minus 100.
+
+    This is reported on every successful update.
+
+    This metric is specific to ChromeOS.
+  </summary>
+</histogram>
+
+<histogram name="UpdateEngine.SuccessfulUpdate.DownloadSourcesUsed"
+    enum="UpdateEngineDownloadSources">
+  <owner>zeuthen@chromium.org</owner>
+  <summary>
+    The various download sources used - this is a combination of the values
+    &quot;HTTPS Server&quot;, &quot;HTTP Server&quot; and &quot;HTTP Peer&quot;.
+
+    This is reported on every successful update.
+
+    This metric is specific to ChromeOS.
+  </summary>
+</histogram>
+
+<histogram name="UpdateEngine.SuccessfulUpdate.PayloadSizeMiB" units="MiB">
+  <owner>zeuthen@chromium.org</owner>
+  <summary>
+    The size of the payload, in mebibytes (1048576 bytes).
+
+    This is reported on every successful update.
+
+    This metric is specific to ChromeOS.
+  </summary>
+</histogram>
+
+<histogram name="UpdateEngine.SuccessfulUpdate.PayloadType"
+    enum="UpdateEnginePayloadFormat">
+  <owner>zeuthen@chromium.org</owner>
+  <summary>
+    The payload type (&quot;Delta&quot;, &quot;Full&quot;,
+    &quot;ForcedFull&quot;) used.
+
+    This is reported on every successful update.
+
+    This metric is specific to ChromeOS.
+  </summary>
+</histogram>
+
+<histogram name="UpdateEngine.SuccessfulUpdate.RebootCount" units="count">
+  <owner>zeuthen@chromium.org</owner>
+  <summary>
+    The total number of reboots during the update.
+
+    This is reported on every successful update.
+
+    This metric is specific to ChromeOS.
+  </summary>
+</histogram>
+
+<histogram name="UpdateEngine.SuccessfulUpdate.TotalDurationMinutes"
+    units="minutes">
+  <owner>zeuthen@chromium.org</owner>
+  <summary>
+    The total number of minutes from when an update was detected until an update
+    (possibly another update) was applied. This includes the time waiting for
+    update checks and time the device spent sleeping.
+
+    This is reported on every successful update.
+
+    This metric is specific to ChromeOS.
+  </summary>
+</histogram>
+
+<histogram name="UpdateEngine.SuccessfulUpdate.UpdatesAbandonedCount"
+    units="count">
+  <owner>zeuthen@chromium.org</owner>
+  <summary>
+    The total number of updates that were abandoned since the last successful
+    update.
+
+    This is reported on every successful update.
+
+    This metric is specific to ChromeOS.
+  </summary>
+</histogram>
+
+<histogram name="UpdateEngine.SuccessfulUpdate.UrlSwitchCount" units="count">
+  <owner>zeuthen@chromium.org</owner>
+  <summary>
+    The total number of times the URL was switched (from e.g. HTTPS to HTTP)
+    because of failures.
+
+    This is reported on every successful update.
+
+    This metric is specific to ChromeOS.
+  </summary>
+</histogram>
+
+<histogram name="UpdateEngine.TimeToRebootMinutes" units="minutes">
+  <owner>zeuthen@chromium.org</owner>
+  <summary>
+    The duration between when an update has successfully completed and the user
+    is presented with the &quot;reboot arrow&quot; and when the system has
+    booted into the new update.
+
+    This is reported every time the device is rebooted after an update has been
+    applied.
+
+    This metric is specific to ChromeOS.
+  </summary>
+</histogram>
+
 <histogram name="Uptime.ChromeExecToLoginPromptVisibleAfterLogout" units="ms">
   <owner>dmikurube@chromium.org</owner>
   <summary>
@@ -28200,6 +31861,48 @@ other types of suffix sets.
   </summary>
 </histogram>
 
+<histogram name="Variations.SimulateSeed.Duration" units="milliseconds">
+  <owner>asvitkine@chromium.org</owner>
+  <summary>
+    Records the time taken to perform variations seed simulation.
+
+    Recorded on every variation seed simulation, which follows a fetch.
+  </summary>
+</histogram>
+
+<histogram name="Variations.SimulateSeed.KillBestEffortChanges">
+  <owner>asvitkine@chromium.org</owner>
+  <summary>
+    Records the result of variations seed simulation. Logs the number of
+    experiment groups in the &quot;kill best effort&quot; category that are
+    expected to change on a restart of the browser with the received seed.
+
+    Recorded on every variation seed simulation, which follows a fetch.
+  </summary>
+</histogram>
+
+<histogram name="Variations.SimulateSeed.KillCriticalChanges">
+  <owner>asvitkine@chromium.org</owner>
+  <summary>
+    Records the result of variations seed simulation. Logs the number of
+    experiment groups in the &quot;kill critical&quot; category that are
+    expected to change on a restart of the browser with the received seed.
+
+    Recorded on every variation seed simulation, which follows a fetch.
+  </summary>
+</histogram>
+
+<histogram name="Variations.SimulateSeed.NormalChanges">
+  <owner>asvitkine@chromium.org</owner>
+  <summary>
+    Records the result of variations seed simulation. Logs the number of
+    experiment groups in the &quot;normal&quot; category that are expected to
+    change on a restart of the browser with the received seed.
+
+    Recorded on every variation seed simulation, which follows a fetch.
+  </summary>
+</histogram>
+
 <histogram name="Variations.StoreSeedSignature" enum="VariationSeedSignature">
   <owner>asvitkine@chromium.org</owner>
   <summary>
@@ -28241,6 +31944,22 @@ other types of suffix sets.
   </summary>
 </histogram>
 
+<histogram name="Viewport.MetaTagType" enum="MetaTagTypeEnum">
+  <owner>bokan@chromium.org</owner>
+  <summary>
+    The viewport meta tag type seen on each page load. Only recorded on Android.
+  </summary>
+</histogram>
+
+<histogram name="Viewport.OverviewZoom" units="Percent">
+  <owner>bokan@chromium.org</owner>
+  <summary>
+    The screen width as a percentage of viewport width (i.e. zoom at which we
+    can see the whole page). Only recorded on Android and for viewport meta tags
+    with constant width.
+  </summary>
+</histogram>
+
 <histogram name="VirtualKeyboard.KeyboardControlEvent"
     enum="KeyboardControlEvent">
   <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
@@ -28392,7 +32111,7 @@ other types of suffix sets.
   </summary>
 </histogram>
 
-<histogram name="WebCore.Editing.Commands" enum="MappedEditingCommands">
+<histogram name="WebCore.Document.execCommand" enum="MappedEditingCommands">
   <owner>yoichio@chromium.org</owner>
   <summary>
     Counts the number of times each document.execCommand is executed. This
@@ -28400,6 +32119,14 @@ other types of suffix sets.
   </summary>
 </histogram>
 
+<histogram name="WebCore.Editing.Commands" enum="MappedEditingCommands">
+  <owner>yoichio@chromium.org</owner>
+  <summary>
+    Counts the number of times each Editor::Command::execute is called. This
+    doesn't count commands not supported by Blink.
+  </summary>
+</histogram>
+
 <histogram name="WebCore.FeatureObserver" enum="FeatureObserver">
   <owner>eseidel@chromium.org</owner>
   <summary>
@@ -28741,7 +32468,9 @@ other types of suffix sets.
 
 <histogram name="WebCore.WebSocket.HandshakeResult"
     enum="WebSocketHandshakeResult">
-  <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
+  <owner>yhirano@chromium.org</owner>
+  <owner>ricea@chromium.org</owner>
+  <owner>tyoshino@chromium.org</owner>
   <summary>
     Count the number of WebSocket handshake for each result. Use this histogram
     as a baseline for investigating feature usage counters.
@@ -28750,10 +32479,23 @@ other types of suffix sets.
 
 <histogram name="WebCore.WebSocket.PerMessageDeflateContextTakeOverMode"
     enum="WebSocketPerMessageDeflateContextTakeOverMode">
-  <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
+  <owner>yhirano@chromium.org</owner>
+  <owner>ricea@chromium.org</owner>
+  <owner>tyoshino@chromium.org</owner>
   <summary>
     Count the number of WebSockets that accepted permessage-deflate extension
-    for each context take over mode.
+    for each context take over mode. Used by the old Blink-based WebSocket
+    implementation.
+  </summary>
+</histogram>
+
+<histogram name="WebCore.WebSocket.SendType" enum="WebSocketSendType">
+  <owner>yhirano@chromium.org</owner>
+  <owner>ricea@chromium.org</owner>
+  <owner>tyoshino@chromium.org</owner>
+  <summary>
+    Count the number of send() method calls on WebSockets for each argument
+    type.
   </summary>
 </histogram>
 
@@ -28767,6 +32509,7 @@ other types of suffix sets.
 </histogram>
 
 <histogram name="WebFont.BlankTextShownTime" units="milliseconds">
+  <owner>kenjibaheux@chromium.org</owner>
   <owner>ksakamoto@chromium.org</owner>
   <summary>
     A histogram tracking the time we spent showing blank text because a web font
@@ -28777,6 +32520,7 @@ other types of suffix sets.
 
 <histogram name="WebFont.CacheHit" enum="WebFontCacheHit">
   <owner>dmikurube@chromium.org</owner>
+  <owner>kenjibaheux@chromium.org</owner>
   <owner>ksakamoto@chromium.org</owner>
   <summary>
     Recorded upon web fonts load. Counts the number of times web font is loaded
@@ -28785,7 +32529,60 @@ other types of suffix sets.
   </summary>
 </histogram>
 
+<histogram name="WebFont.CORSSuccess" enum="BooleanSuccess">
+  <owner>bashi@chromium.org</owner>
+  <owner>kenjibaheux@chromium.org</owner>
+  <summary>The success or failure of web fonts CORS-enabled fetching.</summary>
+</histogram>
+
+<histogram name="WebFont.DiskCache.EntryAge.Evict" units="hours">
+  <owner>kenjibaheux@chromium.org</owner>
+  <owner>ksakamoto@chromium.org</owner>
+  <summary>
+    Recorded upon an eviction of a cache entry for a font in Google Fonts.
+    Records the age of the cache entry.
+  </summary>
+</histogram>
+
+<histogram name="WebFont.DiskCache.EntryAge.Hit" units="hours">
+  <owner>kenjibaheux@chromium.org</owner>
+  <owner>ksakamoto@chromium.org</owner>
+  <summary>
+    Recorded upon a cache hit for a font in Google Fonts. Records the age of the
+    cache entry.
+  </summary>
+</histogram>
+
+<histogram name="WebFont.DiskCache.ReuseCount.Evict">
+  <owner>kenjibaheux@chromium.org</owner>
+  <owner>ksakamoto@chromium.org</owner>
+  <summary>
+    When a cache entry for a font in Google Fonts is evicted, records the reuse
+    count of the cache entry.
+  </summary>
+</histogram>
+
+<histogram name="WebFont.DiskCache.ReuseCount.Hit">
+  <owner>kenjibaheux@chromium.org</owner>
+  <owner>ksakamoto@chromium.org</owner>
+  <summary>
+    Recorded upon a cache hit for a font in Google Fonts. Records the reuse
+    count of the cache entry.
+  </summary>
+</histogram>
+
+<histogram name="WebFont.DiskCacheHit" enum="WebFontDiskCacheHit">
+  <owner>kenjibaheux@chromium.org</owner>
+  <owner>ksakamoto@chromium.org</owner>
+  <summary>
+    Whether the font was in the cache or not. &quot;Previously in the
+    cache&quot; means there was an evicted entry for the font in the cache.
+    Recorded upon a disk cache query for a font in Google Fonts.
+  </summary>
+</histogram>
+
 <histogram name="WebFont.DownloadTime.0.Under10KB" units="milliseconds">
+  <owner>kenjibaheux@chromium.org</owner>
   <owner>ksakamoto@chromium.org</owner>
   <summary>
     The time it takes for a webfont download to finish, for webfonts of under
@@ -28794,6 +32591,7 @@ other types of suffix sets.
 </histogram>
 
 <histogram name="WebFont.DownloadTime.1.10KBTo50KB" units="milliseconds">
+  <owner>kenjibaheux@chromium.org</owner>
   <owner>ksakamoto@chromium.org</owner>
   <summary>
     The time it takes for a webfont download to finish, for webfonts of
@@ -28802,6 +32600,7 @@ other types of suffix sets.
 </histogram>
 
 <histogram name="WebFont.DownloadTime.2.50KBTo100KB" units="milliseconds">
+  <owner>kenjibaheux@chromium.org</owner>
   <owner>ksakamoto@chromium.org</owner>
   <summary>
     The time it takes for a webfont download to finish, for webfonts of
@@ -28810,6 +32609,7 @@ other types of suffix sets.
 </histogram>
 
 <histogram name="WebFont.DownloadTime.3.100KBTo1MB" units="milliseconds">
+  <owner>kenjibaheux@chromium.org</owner>
   <owner>ksakamoto@chromium.org</owner>
   <summary>
     The time it takes for a webfont download to finish, for webfonts of
@@ -28818,6 +32618,7 @@ other types of suffix sets.
 </histogram>
 
 <histogram name="WebFont.DownloadTime.4.Over1MB" units="milliseconds">
+  <owner>kenjibaheux@chromium.org</owner>
   <owner>ksakamoto@chromium.org</owner>
   <summary>
     The time it takes for a webfont download to finish, for webfonts of over
@@ -28826,6 +32627,7 @@ other types of suffix sets.
 </histogram>
 
 <histogram name="WebFont.DownloadTime.LoadError" units="milliseconds">
+  <owner>kenjibaheux@chromium.org</owner>
   <owner>ksakamoto@chromium.org</owner>
   <summary>
     The time taken for a webfont download that failed. Includes aborted
@@ -28834,6 +32636,7 @@ other types of suffix sets.
 </histogram>
 
 <histogram name="WebFont.HadBlankText" enum="BooleanHadBlankText">
+  <owner>kenjibaheux@chromium.org</owner>
   <owner>ksakamoto@chromium.org</owner>
   <summary>
     This metrics is logged when a page that use web fonts is loaded. The value
@@ -28846,6 +32649,7 @@ other types of suffix sets.
   <obsolete>
     Renamed to WebFont.StyleRecalcToDownloadLatency for clarity.
   </obsolete>
+  <owner>kenjibaheux@chromium.org</owner>
   <owner>ksakamoto@chromium.org</owner>
   <summary>
     The time from when the webfont was referenced by a calculated style for the
@@ -28857,6 +32661,7 @@ other types of suffix sets.
   <obsolete>
     Deprecated as of 8/2013, replaced by WebFont.DownloadTime.0.Under10KB.
   </obsolete>
+  <owner>kenjibaheux@chromium.org</owner>
   <owner>ksakamoto@chromium.org</owner>
   <summary>
     The time it takes for a webfont download to finish, for webfonts of under
@@ -28868,6 +32673,7 @@ other types of suffix sets.
   <obsolete>
     Deprecated as of 8/2013, replaced by WebFont.DownloadTime.1.10KBTo50KB.
   </obsolete>
+  <owner>kenjibaheux@chromium.org</owner>
   <owner>ksakamoto@chromium.org</owner>
   <summary>
     The time it takes for a webfont download to finish, for webfonts of
@@ -28879,6 +32685,7 @@ other types of suffix sets.
   <obsolete>
     Deprecated as of 8/2013, replaced by WebFont.DownloadTime.2.50KBTo100KB.
   </obsolete>
+  <owner>kenjibaheux@chromium.org</owner>
   <owner>ksakamoto@chromium.org</owner>
   <summary>
     The time it takes for a webfont download to finish, for webfonts of
@@ -28890,6 +32697,7 @@ other types of suffix sets.
   <obsolete>
     Deprecated as of 8/2013, replaced by WebFont.DownloadTime.3.100KBTo1MB.
   </obsolete>
+  <owner>kenjibaheux@chromium.org</owner>
   <owner>ksakamoto@chromium.org</owner>
   <summary>
     The time it takes for a webfont download to finish, for webfonts of
@@ -28901,6 +32709,7 @@ other types of suffix sets.
   <obsolete>
     Deprecated as of 8/2013, replaced by WebFont.DownloadTime.4.Over1MB.
   </obsolete>
+  <owner>kenjibaheux@chromium.org</owner>
   <owner>ksakamoto@chromium.org</owner>
   <summary>
     The time it takes for a webfont download to finish, for webfonts of over
@@ -28912,6 +32721,7 @@ other types of suffix sets.
   <obsolete>
     Deprecated as of 8/2013, replaced by WebFont.DownloadTime.LoadError.
   </obsolete>
+  <owner>kenjibaheux@chromium.org</owner>
   <owner>ksakamoto@chromium.org</owner>
   <summary>
     The time taken for a webfont download that failed. Includes aborted
@@ -28921,6 +32731,7 @@ other types of suffix sets.
 
 <histogram name="WebFont.LocalFontUsed" enum="BooleanUsage">
   <owner>dmikurube@chromium.org</owner>
+  <owner>kenjibaheux@chromium.org</owner>
   <owner>ksakamoto@chromium.org</owner>
   <summary>
     Whether a locallly installed font is actually used when @font-face had local
@@ -28928,8 +32739,18 @@ other types of suffix sets.
   </summary>
 </histogram>
 
+<histogram name="WebFont.PackageFormat" enum="WebFontPackageFormat">
+  <owner>kenjibaheux@chromium.org</owner>
+  <owner>ksakamoto@chromium.org</owner>
+  <summary>
+    The packaging format of the font file (e.g. SFNT, WOFF ...) upon a webfont
+    load.
+  </summary>
+</histogram>
+
 <histogram name="WebFont.Resource.StyleRecalcToDownloadLatency"
     units="milliseconds">
+  <owner>kenjibaheux@chromium.org</owner>
   <owner>ksakamoto@chromium.org</owner>
   <summary>
     The time from when the webfont was referenced by a calculated style for the
@@ -28940,6 +32761,7 @@ other types of suffix sets.
 </histogram>
 
 <histogram name="WebFont.Resource.UsageType" enum="WebFontUsageType">
+  <owner>kenjibaheux@chromium.org</owner>
   <owner>ksakamoto@chromium.org</owner>
   <summary>
     For each webfont, this records (a) if the font was 'styled', i.e. referenced
@@ -28957,6 +32779,7 @@ other types of suffix sets.
     Deprecated as of 9/2013, replaced by
     WebFont.Resource.StyleRecalcToDownloadLatency.
   </obsolete>
+  <owner>kenjibaheux@chromium.org</owner>
   <owner>ksakamoto@chromium.org</owner>
   <summary>
     The time from when the webfont was referenced by a calculated style for the
@@ -28968,6 +32791,7 @@ other types of suffix sets.
   <obsolete>
     Deprecated as of 9/2013, replaced by WebFont.Resource.UsageType.
   </obsolete>
+  <owner>kenjibaheux@chromium.org</owner>
   <owner>ksakamoto@chromium.org</owner>
   <summary>
     For each webfont, this records (a) if the font was 'styled', i.e. referenced
@@ -28981,6 +32805,7 @@ other types of suffix sets.
 </histogram>
 
 <histogram name="WebFont.WebFontsInPage">
+  <owner>kenjibaheux@chromium.org</owner>
   <owner>ksakamoto@chromium.org</owner>
   <summary>
     The number of webfonts used in a page. This is recorded when the first
@@ -29120,14 +32945,39 @@ other types of suffix sets.
 </histogram>
 
 <histogram name="WebRTC.DataChannelCounters" enum="DataChannelCounters">
-  <owner>tommi@chromium.org</owner>
+  <owner>perkj@chromium.org</owner>
   <summary>
     Counters on creation, opening, and a few main attributes of data channels.
   </summary>
 </histogram>
 
+<histogram name="WebRTC.DataChannelMaxRetransmits">
+  <owner>perkj@chromium.org</owner>
+  <summary>
+    The maximum number of retransmissions that are attempted in unreliable mode.
+    It is set to the value used in the configuration when a RTCDataChannel is
+    created.
+  </summary>
+</histogram>
+
+<histogram name="WebRTC.DataChannelMaxRetransmitTime" units="milliseconds">
+  <owner>perkj@chromium.org</owner>
+  <summary>
+    The length of the time window during which transmissions and retransmissions
+    may occur in unreliable mode. It is set to the value used in the
+    configuration when a RTCDataChannel is created.
+  </summary>
+</histogram>
+
+<histogram name="WebRTC.DesktopCaptureCounters" enum="DesktopCaptureCounters">
+  <owner>jiayl@chromium.org</owner>
+  <summary>
+    Counters on creation of DesktopCaptureDevice and the first capture call.
+  </summary>
+</histogram>
+
 <histogram name="WebRTC.NumDataChannelsPerPeerConnection">
-  <owner>tommi@chromium.org</owner>
+  <owner>perkj@chromium.org</owner>
   <summary>
     Number of data channels created per PeerConnection. Sample added to the
     histogram when the PeerConnection is destroyed. Note that this is done
@@ -29137,6 +32987,33 @@ other types of suffix sets.
   </summary>
 </histogram>
 
+<histogram name="WebRTC.PeerConnection.IPMetrics" enum="PeerConnectionCounters">
+  <owner>mallinath@chromium.org</owner>
+  <summary>
+    Counters on IPv4 and IPv6 usage in PeerConnection. These values are logged
+    once per PeerConnection.
+  </summary>
+</histogram>
+
+<histogram name="WebRTC.PeerConnection.IPv4Interfaces">
+  <owner>mallinath@chromium.org</owner>
+  <summary>
+    Number of IPv4 network interfaces discovered in a PeerConnection Session.
+  </summary>
+</histogram>
+
+<histogram name="WebRTC.PeerConnection.IPv6Interfaces">
+  <owner>mallinath@chromium.org</owner>
+  <summary>
+    Number of IPv6 network interfaces discovered in a PeerConnection Session.
+  </summary>
+</histogram>
+
+<histogram name="WebRTC.PeerConnection.TimeToConnect" units="milliseconds">
+  <owner>mallinath@chromium.org</owner>
+  <summary>Time to setup a peer to peer call with PeerConnection.</summary>
+</histogram>
+
 <histogram name="WebRTC.ReceivedAudioTrackDuration" units="milliseconds">
   <owner>perkj@chromium.org</owner>
   <summary>
@@ -29156,7 +33033,7 @@ other types of suffix sets.
 </histogram>
 
 <histogram name="WebRTC.ReliableDataChannelMessageSize" units="bytes">
-  <owner>tommi@chromium.org</owner>
+  <owner>perkj@chromium.org</owner>
   <summary>
     Sizes of messages sent over reliable data channels. The size of an
     individual message is added to the histogram as a sample immediately when a
@@ -29164,6 +33041,11 @@ other types of suffix sets.
   </summary>
 </histogram>
 
+<histogram name="WebRTC.ScreenCaptureTime" units="milliseconds">
+  <owner>jiayl@chromium.org</owner>
+  <summary>Time for capturing one frame in screen capturing.</summary>
+</histogram>
+
 <histogram name="WebRTC.SentAudioTrackDuration" units="milliseconds">
   <owner>perkj@chromium.org</owner>
   <summary>
@@ -29192,17 +33074,16 @@ other types of suffix sets.
 </histogram>
 
 <histogram name="WebRTC.webkitApiCount" enum="JavaScriptAPIName">
-  <owner>tommi@chromium.org</owner>
+  <owner>perkj@chromium.org</owner>
   <summary>Counts number of calls to WebRTC APIs from JavaScript.</summary>
 </histogram>
 
 <histogram name="WebRTC.webkitApiCountPerSession" enum="JavaScriptAPIName">
-  <owner>tommi@chromium.org</owner>
+  <owner>perkj@chromium.org</owner>
   <summary>
-    Counts number of calls to WebRTC APIs from JavaScript, once   per
-    &quot;session&quot; which is demarcated by the total number of MediaStreams
-    within a renderer process that are being sent over a PeerConnection
-    transitioning from or to 0.
+    Counts the number of calls to WebRTC APIs from JavaScript once per session.
+    A session is a crude estimate since its implemented as the lifetime of the
+    render process that called the WebRTC API.
   </summary>
 </histogram>
 
@@ -29217,6 +33098,11 @@ other types of suffix sets.
   </summary>
 </histogram>
 
+<histogram name="WebRTC.WindowCaptureTime" units="milliseconds">
+  <owner>jiayl@chromium.org</owner>
+  <summary>Time for capturing one frame in window capturing.</summary>
+</histogram>
+
 <histogram name="Webstore.ExtensionInstallResult" enum="BooleanSuccess">
   <owner>jackhou@chromium.org</owner>
   <summary>
@@ -29233,6 +33119,11 @@ other types of suffix sets.
   </summary>
 </histogram>
 
+<histogram name="Windows.Tablet" enum="BooleanTablet">
+  <owner>zturner@chromium.org</owner>
+  <summary>Count of browser launches from a Windows tablet pc.</summary>
+</histogram>
+
 <histogram name="WinTimeTicks.FailedToChangeCores" enum="WindowsVersion">
   <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
   <summary>
@@ -29283,7 +33174,7 @@ other types of suffix sets.
 </histogram>
 
 <histogram name="WrenchMenu.RecentTabsSubMenu" enum="RecentTabsAction">
-  <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
+  <owner>rpop@chromium.org</owner>
   <summary>
     The number of times each tab or window restore option in the Recent Tabs
     submenu is clicked.
@@ -29354,6 +33245,20 @@ other types of suffix sets.
   <int value="4" label="Snapped"/>
 </enum>
 
+<enum name="AddressFamily" type="int">
+  <int value="0" label="Unspecified"/>
+  <int value="1" label="IPv4"/>
+  <int value="2" label="IPv6"/>
+</enum>
+
+<enum name="AlternateProtocolUsage" type="int">
+  <int value="0" label="ALTERNATE_PROTOCOL_USAGE_NO_RACE"/>
+  <int value="1" label="ALTERNATE_PROTOCOL_USAGE_WON_RACE"/>
+  <int value="2" label="ALTERNATE_PROTOCOL_USAGE_LOST_RACE"/>
+  <int value="3" label="ALTERNATE_PROTOCOL_USAGE_MAPPING_MISSING"/>
+  <int value="4" label="ALTERNATE_PROTOCOL_USAGE_BROKEN"/>
+</enum>
+
 <enum name="AndroidActivityId" type="int">
   <int value="1" label="Unknown"/>
   <int value="2" label="Main"/>
@@ -29792,6 +33697,11 @@ other types of suffix sets.
   <int value="17" label="fp05cc03e1"/>
 </enum>
 
+<enum name="AutofillMacAddressBook" type="int">
+  <int value="0" label="Showed popup entry"/>
+  <int value="1" label="Selected popup entry"/>
+</enum>
+
 <enum name="AutofillQuality" type="int">
   <int value="0" label="Submitted"/>
   <int value="1" label="Autofilled"/>
@@ -29871,6 +33781,9 @@ other types of suffix sets.
   <int value="48" label="Password, Unknown"/>
   <int value="49" label="Password, Match"/>
   <int value="50" label="Password, Mismatch"/>
+  <int value="51" label="Addr. line 3, Unknown"/>
+  <int value="52" label="Addr. line 3, Match"/>
+  <int value="53" label="Addr. line 3, Mismatch"/>
 </enum>
 
 <enum name="AutofillUserHappiness" type="int">
@@ -29906,6 +33819,7 @@ other types of suffix sets.
   <int value="2" label="Blacklist failed."/>
   <int value="3" label="Blacklist thunk setup failed."/>
   <int value="4" label="Blacklist interception failed."/>
+  <int value="5" label="Blacklist disabled."/>
 </enum>
 
 <enum name="BluetoothPairingMethod" type="int">
@@ -29984,6 +33898,11 @@ other types of suffix sets.
   <int value="1" label="Deleted"/>
 </enum>
 
+<enum name="BooleanDidEvict" type="int">
+  <int value="0" label="Did not evict"/>
+  <int value="1" label="Did evict"/>
+</enum>
+
 <enum name="BooleanDuplicate" type="int">
   <int value="0" label="Not Duplicate"/>
   <int value="1" label="Duplicate"/>
@@ -30039,6 +33958,11 @@ other types of suffix sets.
   <int value="1" label="Orphan"/>
 </enum>
 
+<enum name="BooleanProfileSignedIn" type="int">
+  <int value="0" label="Profile was not Signed In"/>
+  <int value="1" label="Profile was Signed In"/>
+</enum>
+
 <enum name="BooleanRaced" type="int">
   <int value="0" label="Did Not Race"/>
   <int value="1" label="Raced"/>
@@ -30049,11 +33973,21 @@ other types of suffix sets.
   <int value="1" label="Registered"/>
 </enum>
 
+<enum name="BooleanReported" type="int">
+  <int value="0" label="Not reported"/>
+  <int value="1" label="Reported"/>
+</enum>
+
 <enum name="BooleanSelected" type="int">
   <int value="0" label="No selection"/>
   <int value="1" label="Selected"/>
 </enum>
 
+<enum name="BooleanSkipped" type="int">
+  <int value="0" label="Not skipped"/>
+  <int value="1" label="Skipped"/>
+</enum>
+
 <enum name="BooleanStale" type="int">
   <int value="0" label="Fresh"/>
   <int value="1" label="Stale"/>
@@ -30074,6 +34008,11 @@ other types of suffix sets.
   <int value="1" label="Memory low, tabs discarded"/>
 </enum>
 
+<enum name="BooleanTablet" type="int">
+  <int value="0" label="Non tablet"/>
+  <int value="1" label="Tablet"/>
+</enum>
+
 <enum name="BooleanUsage" type="int">
   <int value="0" label="Not Used"/>
   <int value="1" label="Used"/>
@@ -30089,6 +34028,13 @@ other types of suffix sets.
   <int value="1" label="Wiped out"/>
 </enum>
 
+<enum name="BrokenAlternateProtocolLocation" type="int">
+  <int value="0" label="HTTP_STREAM_FACTORY_IMPL_JOB"/>
+  <int value="1" label="QUIC_STREAM_FACTORY"/>
+  <int value="2" label="HTTP_STREAM_FACTORY_IMPL_JOB_ALT"/>
+  <int value="3" label="HTTP_STREAM_FACTORY_IMPL_JOB_MAIN"/>
+</enum>
+
 <enum name="CanvasContextType" type="int">
   <int value="0" label="2d"/>
   <int value="1" label="webkit-3d"/>
@@ -30138,6 +34084,13 @@ other types of suffix sets.
   <int value="8" label="YV12"/>
 </enum>
 
+<enum name="CastPlayBackState" type="int">
+  <int value="0" label="YT_PLAYER_SUCCESS"/>
+  <int value="1" label="YT_PLAYER_FAILURE"/>
+  <int value="2" label="DEFAULT_PLAYER_SUCCESS"/>
+  <int value="3" label="DEFAULT_PLAYER_FAILURE"/>
+</enum>
+
 <enum name="CatSixtyFour" type="int">
   <int value="0" label="Saber-Toothed Cat (&lt;10.6), 32-bit (?)"/>
   <int value="1" label="Saber-Toothed Cat (&lt;10.6), 64-bit (?)"/>
@@ -30154,9 +34107,12 @@ other types of suffix sets.
   <int value="12" label="Lion (10.7), 8-bit (?)"/>
   <int value="13" label="Mountain Lion (10.8), 8-bit (?)"/>
   <int value="14" label="Mavericks (10.9), 8-bit (?)"/>
-  <int value="15" label="FutureCat (&gt;10.9), 32-bit (?)"/>
-  <int value="16" label="FutureCat (&gt;10.9), 64-bit"/>
-  <int value="17" label="FutureCat (&gt;10.9), 8-bit (?)"/>
+  <int value="15" label="Yosemite (10.10), 32-bit (?)"/>
+  <int value="16" label="Yosemite (10.10), 64-bit"/>
+  <int value="17" label="Yosemite (10.10), 8-bit (?)"/>
+  <int value="18" label="FutureCat (&gt;10.10), 32-bit (?)"/>
+  <int value="19" label="FutureCat (&gt;10.10), 64-bit"/>
+  <int value="20" label="FutureCat (&gt;10.10), 8-bit (?)"/>
 </enum>
 
 <enum name="ChannelLayout" type="int">
@@ -30337,11 +34293,24 @@ other types of suffix sets.
   <int value="2" label="Will use composited scrolling"/>
 </enum>
 
+<enum name="CompositorScrollResult" type="int">
+  <int value="0" label="ScrollOnMainThread"/>
+  <int value="1" label="ScrollStarted"/>
+  <int value="2" label="ScrollIgnored"/>
+  <int value="3" label="ScrollUnknown"/>
+</enum>
+
 <enum name="CompositorType" type="int">
   <int value="0" label="Software compositor"/>
   <int value="1" label="GPU compositor"/>
 </enum>
 
+<enum name="ConnectionResult" type="int">
+  <int value="0" label="Success"/>
+  <int value="1" label="Failure"/>
+  <int value="2" label="Aborted"/>
+</enum>
+
 <enum name="ConnectionType" type="int">
   <summary>
     Connection type as defined in net/base/connection_type_histograms.h
@@ -30542,6 +34511,9 @@ other types of suffix sets.
   <int value="2" label="Bypass due to internal server error"/>
   <int value="3" label="Bypass due to other error"/>
   <int value="4" label="Bypass due to missing via header"/>
+  <int value="5" label="Bypass due to 4xx response"/>
+  <int value="6"
+      label="Bypass due to 407 response from proxy without a challenge"/>
 </enum>
 
 <enum name="DataReductionProxyProbeURLFetchResult" type="int">
@@ -30572,6 +34544,15 @@ other types of suffix sets.
   <int value="2" label="Proxy available and enabled"/>
 </enum>
 
+<enum name="DesktopCaptureCounters" type="int">
+  <int value="0" label="Screen capturer created."/>
+  <int value="1" label="Window capturer created."/>
+  <int value="2" label="First screen capture call succeeded."/>
+  <int value="3" label="First screen capture call failed."/>
+  <int value="4" label="First window capture call succeeded."/>
+  <int value="5" label="First window capture call failed."/>
+</enum>
+
 <enum name="DevicePermissionActions" type="int">
   <int value="0" label="AllowHttps"/>
   <int value="1" label="AllowHttp"/>
@@ -30632,6 +34613,13 @@ other types of suffix sets.
   <int value="20" label="SQLite Integrity Web Data Test"/>
 </enum>
 
+<enum name="DifferentPrimaryAccounts" type="int">
+  <int value="0" label="Primary Accounts the same"/>
+  <int value="1" label="(obsolete) Primary Accounts different"/>
+  <int value="2" label="No GAIA account in cookie jar"/>
+  <int value="3" label="Primary accounts present but different"/>
+</enum>
+
 <enum name="DllHash" type="int">
 <!-- Generated by chrome_elf/dll_hash_for_uma/dll_hash_for_uma_main.cc -->
 
@@ -30730,6 +34718,11 @@ other types of suffix sets.
   </int>
 </enum>
 
+<enum name="DomainReliability.BooleanFailover" type="int">
+  <int value="0" label="Used first collector"/>
+  <int value="1" label="Failed over to another collector"/>
+</enum>
+
 <enum name="DoubleGetExperimentMethods" type="int">
   <int value="0" label="POST"/>
   <int value="1" label="GET_CACHABLE"/>
@@ -31099,6 +35092,38 @@ other types of suffix sets.
   <int value="4" label="TTLS"/>
 </enum>
 
+<enum name="EasyUnlockButton" type="int">
+  <int value="0" label="Setup app launches"/>
+  <int value="1" label="Find device"/>
+  <int value="2" label="Pair device"/>
+  <int value="3" label="Try out"/>
+  <int value="4" label="Enable"/>
+  <int value="5" label="Disable"/>
+</enum>
+
+<enum name="EasyUnlockNotificationEvent" type="int">
+  <int value="0" label="Set up notification shown"/>
+  <int value="1" label="Set up notification clicked"/>
+  <int value="2" label="Try out notification shown"/>
+  <int value="3" label="Try out notification clicked"/>
+</enum>
+
+<enum name="EasyUnlockSetupState" type="int">
+  <int value="0" label="Success"/>
+  <int value="1" label="Scan (initial)"/>
+  <int value="2" label="Scan (in progress)"/>
+  <int value="3" label="Scan (error)"/>
+  <int value="4" label="Pairing (initial)"/>
+  <int value="5" label="Pairing (in progress)"/>
+  <int value="6" label="Pairing (error)"/>
+  <int value="7" label="Help"/>
+</enum>
+
+<enum name="EasyUnlockUnlockEvent" type="int">
+  <int value="0" label="Screen unlocked (total)"/>
+  <int value="1" label="Screen unlocked (via EasyUnlock)"/>
+</enum>
+
 <enum name="EnterpriseCheckError" type="int">
   <int value="0" label="Cound not get net join info."/>
   <int value="1" label="Cound not bind to domain controller."/>
@@ -31249,11 +35274,14 @@ other types of suffix sets.
   <int value="23" label="Domain mismatch">
     Enrollment failed because the device belongs to a different domain.
   </int>
+  <int value="24" label="Triggered">
+    Enrollment has been triggered, the credential screen has been shown.
+  </int>
+  <int value="25" label="Retried">The user retried to submit credentials.</int>
 </enum>
 
 <enum name="EnterprisePolicies" type="int">
-<!-- Generated from
-     ../../../components/policy/resources/policy_templates.json -->
+<!-- Generated from ../../../components/policy/resources/policy_templates.json -->
 
   <int value="1" label="Configure the home page URL"/>
   <int value="2" label="Use New Tab Page as homepage"/>
@@ -31380,8 +35408,10 @@ other types of suffix sets.
   <int value="111" label="Set media disk cache size in bytes"/>
   <int value="112" label="Enterprise web store URL (deprecated)"/>
   <int value="113" label="Enterprise web store name (deprecated)"/>
-  <int value="114" label="Enable TLS domain-bound certificates extension"/>
-  <int value="115" label="Enable reporting memory info (JS heap size) to page"/>
+  <int value="114"
+      label="Enable TLS domain-bound certificates extension (deprecated)"/>
+  <int value="115"
+      label="Enable reporting memory info (JS heap size) to page (deprecated)"/>
   <int value="116" label="Proxy settings"/>
   <int value="117" label="Disable Print Preview"/>
   <int value="118" label="Disable SSL record splitting"/>
@@ -31532,7 +35562,7 @@ other types of suffix sets.
              battery power"/>
   <int value="223" label="Enable creation of supervised users"/>
   <int value="224" label="Report device network interfaces"/>
-  <int value="225" label="Power mangement on the login screen"/>
+  <int value="225" label="Power management on the login screen"/>
   <int value="226"
       label="Action to take when the idle delay is reached while running on
              AC power"/>
@@ -31563,17 +35593,16 @@ other types of suffix sets.
   <int value="245" label="Ephemeral profile"/>
   <int value="246"
       label="Selects the strategy used to free up disk space during automatic
-             clean-up"/>
-  <int value="247"
-      label="Specify whether power management delays and the session length
-             limit should only start running after initial user activity in a
-             session"/>
+             clean-up (deprecated)"/>
+  <int value="247" label="Wait for initial user activity"/>
   <int value="248" label="Report device users"/>
   <int value="249" label="User avatar image"/>
   <int value="250" label="Enable network configuration prompt when offline"/>
-  <int value="251" label="Native Messaging blacklist"/>
-  <int value="252" label="Native Messaging whitelist"/>
-  <int value="253" label="Allow user-level Native Messaging hosts"/>
+  <int value="251" label="Configure native messaging blacklist"/>
+  <int value="252" label="Configure native messaging whitelist"/>
+  <int value="253"
+      label="Allow user-level Native Messaging hosts (installed without admin
+             permissions)."/>
   <int value="254"
       label="Limit the time for which a user authenticated via SAML can log
              in offline"/>
@@ -31585,14 +35614,25 @@ other types of suffix sets.
       label="Power management settings when the user becomes idle"/>
   <int value="259" label="Screen lock delays"/>
   <int value="260" label="Media keys default to function keys"/>
-  <int value="261" label="Enable WPAD quick check"/>
+  <int value="261" label="Enable WPAD optimization"/>
   <int value="262" label="Wallpaper image"/>
-  <int value="265" label="Enables the old web-based signin flows"/>
+  <int value="263"
+      label="Enable the use of relay servers by the remote access host"/>
+  <int value="264"
+      label="Restrict the UDP port range used by the remote access host"/>
+  <int value="265" label="Enables the old web-based signin"/>
+  <int value="266" label="Block developer mode"/>
+  <int value="267" label="Show the apps shortcut in the bookmark bar"/>
+  <int value="268" label="Register protocol handlers"/>
+  <int value="269" label="Enable virtual keyboard"/>
+  <int value="270" label="Enable deprecated web platform features"/>
 </enum>
 
 <enum name="EnterprisePolicyInvalidations" type="int">
-  <int value="0" label="No payload"/>
-  <int value="1" label="Payload"/>
+  <int value="0" label="No payload; not expired"/>
+  <int value="1" label="Payload; not expired"/>
+  <int value="2" label="No payload; expired"/>
+  <int value="3" label="Payload; expired"/>
 </enum>
 
 <enum name="EnterprisePolicyLoadStatus" type="int">
@@ -31792,6 +35832,26 @@ other types of suffix sets.
   <int value="2" label="Event Page"/>
 </enum>
 
+<enum name="ExtensionBubbleAction" type="int">
+  <int value="0" label="Learn more"/>
+  <int value="1" label="Execute"/>
+  <int value="2" label="Dismiss"/>
+</enum>
+
+<enum name="ExtensionCreationFlags" type="int">
+  <int value="0" label="REQUIRE_KEY"/>
+  <int value="1" label="REQUIRE_MODERN_MANIFEST_VERSION"/>
+  <int value="2" label="ALLOW_FILE_ACCESS"/>
+  <int value="3" label="FROM_WEBSTORE"/>
+  <int value="4" label="FROM_BOOKMARK"/>
+  <int value="5" label="FOLLOW_SYMLINKS_ANYWHERE"/>
+  <int value="6" label="ERROR_ON_PRIVATE_KEY"/>
+  <int value="7" label="WAS_INSTALLED_BY_DEFAULT"/>
+  <int value="8" label="REQUIRE_PERMISSIONS_CONSENT"/>
+  <int value="9" label="IS_EPHEMERAL"/>
+  <int value="10" label="WAS_INSTALLED_BY_OEM"/>
+</enum>
+
 <enum name="ExtensionDisabledUIUserResponse" type="int">
   <int value="0" label="IGNORED"/>
   <int value="1" label="REENABLE"/>
@@ -31847,8 +35907,8 @@ other types of suffix sets.
   <int value="28" label="DELETED_FILEBROWSERPRIVATE_ISFULLSCREEN"/>
   <int value="29" label="AUTOTESTPRIVATE_LOGOUT"/>
   <int value="30" label="EXPERIMENTAL_HISTORY_GETMOSTVISITED"/>
-  <int value="31" label="BLUETOOTH_DISCONNECT"/>
-  <int value="32" label="BLUETOOTH_SETOUTOFBANDPAIRINGDATA"/>
+  <int value="31" label="DELETED_BLUETOOTH_DISCONNECT"/>
+  <int value="32" label="DELETED_BLUETOOTH_SETOUTOFBANDPAIRINGDATA"/>
   <int value="33" label="BOOKMARKMANAGERPRIVATE_CANPASTE"/>
   <int value="34" label="AUTOTESTPRIVATE_RESTART"/>
   <int value="35" label="USB_CLAIMINTERFACE"/>
@@ -31954,7 +36014,7 @@ other types of suffix sets.
   <int value="135" label="CONTEXTMENUS_UPDATE"/>
   <int value="136" label="BOOKMARKS_SEARCH"/>
   <int value="137" label="EXPERIMENTAL_APP_CLEARALLNOTIFICATIONS"/>
-  <int value="138" label="BLUETOOTH_GETLOCALOUTOFBANDPAIRINGDATA"/>
+  <int value="138" label="DELETED_BLUETOOTH_GETLOCALOUTOFBANDPAIRINGDATA"/>
   <int value="139" label="SYSTEMPRIVATE_GETUPDATESTATUS"/>
   <int value="140" label="FONTSETTINGS_CLEARMINIMUMFONTSIZE"/>
   <int value="141" label="DELETED_FILEBROWSERPRIVATE_GETFILELOCATIONS"/>
@@ -32092,11 +36152,11 @@ other types of suffix sets.
   <int value="272" label="PAGEACTIONS_DISABLEFORTAB"/>
   <int value="273" label="DEVELOPERPRIVATE_ALLOWFILEACCESS"/>
   <int value="274" label="FILEBROWSERPRIVATE_REMOVEMOUNT"/>
-  <int value="275" label="BLUETOOTH_CONNECT"/>
+  <int value="275" label="DELETED_BLUETOOTH_CONNECT"/>
   <int value="276" label="TABCAPTURE_CAPTURE"/>
   <int value="277" label="NOTIFICATIONS_CREATE"/>
   <int value="278" label="TABS_DUPLICATE"/>
-  <int value="279" label="BLUETOOTH_WRITE"/>
+  <int value="279" label="DELETED_BLUETOOTH_WRITE"/>
   <int value="280" label="PAGEACTION_SHOW"/>
   <int value="281" label="WALLPAPERPRIVATE_GETTHUMBNAIL"/>
   <int value="282" label="DOWNLOADS_PAUSE"/>
@@ -32127,7 +36187,7 @@ other types of suffix sets.
   <int value="307" label="BROWSERACTION_SETICON"/>
   <int value="308" label="EXPERIMENTAL_ACCESSIBILITY_SETACCESSIBILITYENABLED"/>
   <int value="309" label="DELETED_FILEBROWSERPRIVATE_VIEWFILES"/>
-  <int value="310" label="BLUETOOTH_GETSERVICES"/>
+  <int value="310" label="DELETED_BLUETOOTH_GETSERVICES"/>
   <int value="311" label="TABS_UPDATE"/>
   <int value="312" label="BROWSINGDATA_REMOVEFORMDATA"/>
   <int value="313" label="DELETED_FILEBROWSERPRIVATE_RELOADDRIVE"/>
@@ -32162,7 +36222,7 @@ other types of suffix sets.
   <int value="342" label="BROWSERACTION_SETPOPUP"/>
   <int value="343" label="TABS_GETSELECTED"/>
   <int value="344" label="FONTSETTINGS_GETFONT"/>
-  <int value="345" label="BLUETOOTH_READ"/>
+  <int value="345" label="DELETED_BLUETOOTH_READ"/>
   <int value="346" label="WEBREQUESTINTERNAL_EVENTHANDLED"/>
   <int value="347" label="EVENTS_ADDRULES"/>
   <int value="348" label="CONTEXTMENUS_CREATE"/>
@@ -32254,7 +36314,7 @@ other types of suffix sets.
   <int value="434" label="WALLPAPERPRIVATE_SETCUSTOMWALLPAPERLAYOUT"/>
   <int value="435" label="DOWNLOADSINTERNAL_DETERMINEFILENAME"/>
   <int value="436" label="SYNCFILESYSTEM_GETFILESYNCSTATUSES"/>
-  <int value="437" label="MEDIAGALLERIESPRIVATE_GETHANDLERS"/>
+  <int value="437" label="DELETED_MEDIAGALLERIESPRIVATE_GETHANDLERS"/>
   <int value="438" label="WALLPAPERPRIVATE_RESETWALLPAPER"/>
   <int value="439" label="DEVELOPERPRIVATE_PERMISSIONS"/>
   <int value="440" label="WEBSTOREPRIVATE_ENABLEAPPLAUNCHER"/>
@@ -32270,9 +36330,9 @@ other types of suffix sets.
   <int value="450" label="NETWORKINGPRIVATE_GETMANAGEDPROPERTIES"/>
   <int value="451" label="LOCATION_WATCHLOCATION"/>
   <int value="452" label="LOCATION_CLEARWATCH"/>
-  <int value="453" label="BLUETOOTH_ADDPROFILE"/>
-  <int value="454" label="BLUETOOTH_REMOVEPROFILE"/>
-  <int value="455" label="BLUETOOTH_GETPROFILES"/>
+  <int value="453" label="DELETED_BLUETOOTH_ADDPROFILE"/>
+  <int value="454" label="DELETED_BLUETOOTH_REMOVEPROFILE"/>
+  <int value="455" label="DELETED_BLUETOOTH_GETPROFILES"/>
   <int value="456" label="EXPERIMENTAL_IDENTITY_REMOVECACHEDAUTHTOKEN"/>
   <int value="457" label="AUDIO_GETINFO"/>
   <int value="458" label="AUDIO_SETACTIVEDEVICES"/>
@@ -32288,7 +36348,7 @@ other types of suffix sets.
   <int value="467" label="RUNTIME_GETPLATFORMINFO"/>
   <int value="468" label="WEBVIEW_INSERTCSS"/>
   <int value="469" label="METRICSPRIVATE_GETISCRASHRECORDINGENABLED"/>
-  <int value="470" label="IDENTITYPRIVATE_GETRESOURCES"/>
+  <int value="470" label="IDENTITYPRIVATE_GETSTRINGS"/>
   <int value="471" label="NOTIFICATIONS_GET_ALL"/>
   <int value="472" label="USB_LISTINTERFACES"/>
   <int value="473" label="FILESYSTEM_RETAINENTRY"/>
@@ -32473,7 +36533,7 @@ other types of suffix sets.
   <int value="649" label="MEDIAGALLERIES_GETMETADATA"/>
   <int value="650" label="INPUT_IME_SENDKEYEVENTS"/>
   <int value="651" label="VIRTUALKEYBOARDPRIVATE_LOCKKEYBOARD"/>
-  <int value="652" label="SCREENLOCKPRIVATE_SHOWBUTTON"/>
+  <int value="652" label="SCREENLOCKPRIVATE_SHOWCUSTOMICON"/>
   <int value="653" label="INPUT_IME_HIDEINPUTVIEW"/>
   <int value="654" label="BOOKMARKMANAGERPRIVATE_UNDO"/>
   <int value="655" label="BOOKMARKMANAGERPRIVATE_REDO"/>
@@ -32511,7 +36571,7 @@ other types of suffix sets.
   <int value="686" label="ACTIVITYLOGPRIVATE_DELETEACTIVITIES"/>
   <int value="687" label="NETWORKINGPRIVATE_SETWIFITDLSENABLEDSTATE"/>
   <int value="688" label="NETWORKINGPRIVATE_GETWIFITDLSSTATUS"/>
-  <int value="689" label="SCREENLOCKPRIVATE_HIDEBUTTON"/>
+  <int value="689" label="SCREENLOCKPRIVATE_HIDECUSTOMICON"/>
   <int value="690" label="SCREENLOCKPRIVATE_SETAUTHTYPE"/>
   <int value="691" label="SCREENLOCKPRIVATE_GETAUTHTYPE"/>
   <int value="692" label="SCREENLOCKPRIVATE_ACCEPTAUTHATTEMPT"/>
@@ -32521,12 +36581,109 @@ other types of suffix sets.
   <int value="696" label="WEBVIEW_CONTEXTMENUSUPDATE"/>
   <int value="697" label="WEBVIEW_CONTEXTMENUSREMOVE"/>
   <int value="698" label="WEBVIEW_CONTEXTMENUSREMOVEALL"/>
-  <int value="699" label="AUTOMATIONINTERNAL_ENABLECURRENTTAB"/>
+  <int value="699" label="AUTOMATIONINTERNAL_ENABLETAB"/>
   <int value="700" label="APP_CURRENTWINDOWINTERNAL_SETSIZECONSTRAINTS"/>
   <int value="701" label="BLUETOOTH_GETDEVICE"/>
   <int value="702" label="GCM_UNREGISTER"/>
   <int value="703" label="FILEBROWSERPRIVATE_REQUESTDRIVESHARE"/>
   <int value="704" label="METRICSPRIVATE_RECORDSPARSEVALUE"/>
+  <int value="705" label="HOTWORDPRIVATE_SETAUDIOLOGGINGENABLED"/>
+  <int value="706" label="BLUETOOTHPRIVATE_SETADAPTERSTATE"/>
+  <int value="707" label="BLUETOOTHPRIVATE_ENABLEPAIRING"/>
+  <int value="708" label="BLUETOOTHPRIVATE_DISABLEPAIRING"/>
+  <int value="709" label="BLUETOOTHPRIVATE_SETPAIRINGRESPONSE"/>
+  <int value="710" label="NETWORKINGPRIVATE_GETCAPTIVEPORTALSTATUS"/>
+  <int value="711" label="AUTOMATIONINTERNAL_PERFORMACTION"/>
+  <int value="712" label="DELETED_BLUETOOTH_UPDATE_SOCKET"/>
+  <int value="713" label="DELETED_BLUETOOTH_SET_SOCKET_PAUSED"/>
+  <int value="714" label="DELETED_BLUETOOTH_GET_SOCKET"/>
+  <int value="715" label="DELETED_BLUETOOTH_GET_SOCKETS"/>
+  <int value="716" label="FILESYSTEMPROVIDER_UNMOUNT"/>
+  <int value="717" label="FILESYSTEMPROVIDERINTERNAL_UNMOUNTREQUESTEDSUCCESS"/>
+  <int value="718" label="FILESYSTEMPROVIDERINTERNAL_UNMOUNTREQUESTEDERROR"/>
+  <int value="719" label="MEDIAGALLERIES_DROPPERMISSIONFORMEDIAFILESYSTEM"/>
+  <int value="720" label="WEBCAMPRIVATE_SET"/>
+  <int value="721" label="WEBCAMPRIVATE_RESET"/>
+  <int value="722" label="WEBCAMPRIVATE_GET"/>
+  <int value="723" label="BLUETOOTHLOWENERGY_GETSERVICE"/>
+  <int value="724" label="BLUETOOTHLOWENERGY_GETSERVICES"/>
+  <int value="725" label="BLUETOOTHLOWENERGY_GETCHARACTERISTIC"/>
+  <int value="726" label="BLUETOOTHLOWENERGY_GETCHARACTERISTICS"/>
+  <int value="727" label="BLUETOOTHLOWENERGY_GETINCLUDEDSERVICES"/>
+  <int value="728" label="BLUETOOTHLOWENERGY_GETDESCRIPTOR"/>
+  <int value="729" label="BLUETOOTHLOWENERGY_GETDESCRIPTORS"/>
+  <int value="730" label="BLUETOOTHLOWENERGY_READCHARACTERISTICVALUE"/>
+  <int value="731" label="BLUETOOTHLOWENERGY_WRITECHARACTERISTICVALUE"/>
+  <int value="732" label="BLUETOOTHLOWENERGY_READDESCRIPTORVALUE"/>
+  <int value="733" label="BLUETOOTHLOWENERGY_WRITEDESCRIPTORVALUE"/>
+  <int value="734" label="BOOKMARKMANAGERPRIVATE_CREATEWITHMETAINFO"/>
+  <int value="735" label="BOOKMARKMANAGERPRIVATE_UPDATEMETAINFO"/>
+  <int value="736" label="BLUETOOTHSOCKET_CREATE"/>
+  <int value="737" label="BLUETOOTHSOCKET_UPDATE"/>
+  <int value="738" label="BLUETOOTHSOCKET_SETPAUSED"/>
+  <int value="739" label="BLUETOOTHSOCKET_LISTENUSINGRFCOMM"/>
+  <int value="740" label="BLUETOOTHSOCKET_LISTENUSINGINSECURERFCOMM"/>
+  <int value="741" label="BLUETOOTHSOCKET_LISTENUSINGL2CAP"/>
+  <int value="742" label="BLUETOOTHSOCKET_CONNECT"/>
+  <int value="743" label="BLUETOOTHSOCKET_DISCONNECT"/>
+  <int value="744" label="BLUETOOTHSOCKET_CLOSE"/>
+  <int value="745" label="BLUETOOTHSOCKET_SEND"/>
+  <int value="746" label="BLUETOOTHSOCKET_GETINFO"/>
+  <int value="747" label="BLUETOOTHSOCKET_GETSOCKETS"/>
+  <int value="748" label="WEBSTOREPRIVATE_SIGNINFUNCTION"/>
+  <int value="749" label="SHELL_CREATEWINDOW"/>
+  <int value="750"
+      label="FILESYSTEMPROVIDERINTERNAL_GETMETADATAREQUESTEDSUCCESS"/>
+  <int value="751"
+      label="FILESYSTEMPROVIDERINTERNAL_GETMETADATAREQUESTEDERROR"/>
+  <int value="752" label="BROWSER_OPENTAB"/>
+  <int value="753" label="MANAGEMENT_CREATEAPPSHORTCUT"/>
+  <int value="754" label="WEBVIEW_SHOWCONTEXTMENU"/>
+  <int value="755" label="WEBRTCLOGGINGPRIVATE_STARTRTPDUMP"/>
+  <int value="756" label="WEBRTCLOGGINGPRIVATE_STOPRTPDUMP"/>
+  <int value="757" label="AUTOMATIONINTERNAL_ENABLEDESKTOP"/>
+  <int value="758" label="HOTWORDPRIVATE_SETHOTWORDSESSIONSTATE"/>
+  <int value="759" label="HOTWORDPRIVATE_NOTIFYHOTWORDRECOGNITION"/>
+  <int value="760"
+      label="FILESYSTEMPROVIDERINTERNAL_READDIRECTORYREQUESTEDSUCCESS"/>
+  <int value="761"
+      label="FILESYSTEMPROVIDERINTERNAL_READDIRECTORYREQUESTEDERROR"/>
+  <int value="762" label="LEDGER_BATCHEXECUTE"/>
+  <int value="763" label="FILESYSTEMPROVIDERINTERNAL_OPENFILEREQUESTEDSUCCESS"/>
+  <int value="764" label="FILESYSTEMPROVIDERINTERNAL_OPENFILEREQUESTEDERROR"/>
+  <int value="765"
+      label="FILESYSTEMPROVIDERINTERNAL_CLOSEFILEREQUESTEDSUCCESS"/>
+  <int value="766" label="FILESYSTEMPROVIDERINTERNAL_CLOSEFILEREQUESTEDERROR"/>
+  <int value="767" label="SYNCEDNOTIFICATIONSPRIVATE_GETINITIALDATA"/>
+  <int value="768" label="SYNCEDNOTIFICATIONSPRIVATE_UPDATENOTIFICATION"/>
+  <int value="769" label="SYNCEDNOTIFICATIONSPRIVATE_SETRENDERCONTEXT"/>
+  <int value="770" label="IDENTITY_GETACCOUNTS"/>
+  <int value="771" label="FILEBROWSERPRIVATE_RESOLVEISOLATEDENTRIES"/>
+  <int value="772" label="FILESYSTEMPROVIDERINTERNAL_READFILEREQUESTEDSUCCESS"/>
+  <int value="773" label="FILESYSTEMPROVIDERINTERNAL_READFILEREQUESTEDERROR"/>
+  <int value="774" label="NETWORKINGPRIVATE_GETNETWORKS"/>
+  <int value="775" label="WEBVIEW_SETNAME"/>
+  <int value="776" label="ENTERPRISE_PLATFORMKEYSINTERNAL_GENERATEKEY"/>
+  <int value="777" label="ENTERPRISE_PLATFORMKEYSINTERNAL_SIGN"/>
+  <int value="778" label="ENTERPRISE_PLATFORMKEYSINTERNAL_GETTOKENS"/>
+  <int value="779" label="ENTERPRISE_PLATFORMKEYS_GETCERTIFICATES"/>
+  <int value="780" label="ENTERPRISE_PLATFORMKEYS_IMPORTCERTIFICATE"/>
+  <int value="781" label="ENTERPRISE_PLATFORMKEYS_REMOVECERTIFICATE"/>
+  <int value="782" label="FILEBROWSERPRIVATE_OPENINSPECTOR"/>
+  <int value="783" label="STREAMSPRIVATE_ABORT"/>
+  <int value="784" label="MANAGEMENT_SETLAUNCHTYPE"/>
+  <int value="785" label="MANAGEMENT_GENERATEAPPFORLINK"/>
+  <int value="786" label="GUESTVIEWINTERNAL_ALLOCATEINSTANCEID"/>
+  <int value="787" label="WEBVIEW_NAVIGATE"/>
+  <int value="788" label="INPUTMETHODPRIVATE_GETCURRENTINPUTMETHOD"/>
+  <int value="789" label="INPUTMETHODPRIVATE_SETCURRENTINPUTMETHOD"/>
+  <int value="790" label="INPUTMETHODPRIVATE_GETINPUTMETHODS"/>
+  <int value="791" label="IDENTITY_GETPROFILEUSERINFO"/>
+  <int value="792" label="VIRTUALKEYBOARDPRIVATE_OPENSETTINGS"/>
+  <int value="793" label="BLUETOOTHLOWENERGY_CONNECT"/>
+  <int value="794" label="BLUETOOTHLOWENERGY_DISCONNECT"/>
+  <int value="821" label="BLUETOOTHLOWENERGY_STARTCHARACTERISTICNOTIFICATIONS"/>
+  <int value="822" label="BLUETOOTHLOWENERGY_STOPCHARACTERISTICNOTIFICATIONS"/>
 </enum>
 
 <enum name="ExtensionInstallCause" type="int">
@@ -32552,6 +36709,7 @@ other types of suffix sets.
   <int value="5" label="External install prompt"/>
   <int value="6" label="Post install permissions prompt"/>
   <int value="7" label="Launch prompt"/>
+  <int value="8" label="Remote install prompt"/>
 </enum>
 
 <enum name="ExtensionInstallVerifierGetSignatureResult" type="int">
@@ -32577,12 +36735,16 @@ other types of suffix sets.
   <int value="6" label="NO_SIGNATURE"/>
   <int value="7" label="NOT_VERIFIED_BUT_NOT_ENFORCING"/>
   <int value="8" label="NOT_VERIFIED"/>
+  <int value="9" label="NOT_VERIFIED_BUT_INSTALL_TIME_NEWER_THAN_SIGNATURE"/>
+  <int value="10" label="NOT_VERIFIED_BUT_UNKNOWN_ID"/>
+  <int value="11" label="COMPONENT"/>
 </enum>
 
 <enum name="ExtensionInstallVerifierStatus" type="int">
   <int value="0" label="NONE"/>
   <int value="1" label="BOOTSTRAP"/>
   <int value="2" label="ENFORCE"/>
+  <int value="3" label="ENFORCE_STRICT"/>
 </enum>
 
 <enum name="ExtensionLaunchType" type="int">
@@ -32700,6 +36862,9 @@ other types of suffix sets.
   <int value="57" label="kScreenlockPrivate"/>
   <int value="58" label="kOverrideBookmarksUI"/>
   <int value="59" label="kAutomation"/>
+  <int value="60" label="kAccessibilityFeaturesModify"/>
+  <int value="61" label="kAccessibilityFeaturesRead"/>
+  <int value="62" label="kBluetoothPrivate"/>
 </enum>
 
 <enum name="ExtensionServiceVerifyAllSuccess" type="int">
@@ -32810,6 +36975,11 @@ other types of suffix sets.
   <int value="3" label="Unfused; lot ID NZVR7"/>
 </enum>
 
+<enum name="FallbackDNSTestResult" type="int">
+  <int value="0" label="Success"/>
+  <int value="1" label="Failure"/>
+</enum>
+
 <enum name="FallbackSSLVersion" type="int">
   <int value="0" label="FALLBACK_NONE">SSL version fallback did not occur.</int>
   <int value="1" label="FALLBACK_SSL3">Fell back on SSL 3.0.</int>
@@ -32818,7 +36988,7 @@ other types of suffix sets.
 </enum>
 
 <enum name="FeatureObserver" type="int">
-<!-- See http://src.chromium.org/viewvc/blink/trunk/Source/core/page/UseCounter.h -->
+<!-- Generated from ../../../third_party/WebKit/Source/core/frame/UseCounter.h -->
 
   <int value="0" label="PageDestruction"/>
   <int value="1" label="LegacyNotifications"/>
@@ -32826,7 +36996,7 @@ other types of suffix sets.
   <int value="3" label="PrefixedIndexedDB"/>
   <int value="4" label="WorkerStart"/>
   <int value="5" label="SharedWorkerStart"/>
-  <int value="6" label="LegacyWebAudioNoteOn"/>
+  <int value="6" label="LegacyWebAudio"/>
   <int value="7" label="WebAudioStart"/>
   <int value="8" label="PrefixedContentSecurityPolicy"/>
   <int value="9" label="UnprefixedIndexedDB"/>
@@ -32877,7 +37047,7 @@ other types of suffix sets.
   <int value="54" label="Unused: CSSOverflowMarquee"/>
   <int value="55" label="Reflection"/>
   <int value="56" label="CursorVisibility"/>
-  <int value="57" label="StorageInfo"/>
+  <int value="57" label="PrefixedStorageInfo"/>
   <int value="58" label="XFrameOptions"/>
   <int value="59" label="XFrameOptionsSameOrigin"/>
   <int value="60" label="XFrameOptionsSameOriginWithBadAncestorChain"/>
@@ -32903,7 +37073,7 @@ other types of suffix sets.
   <int value="80" label="SVGSwitchElement"/>
   <int value="81" label="PrefixedDocumentRegister"/>
   <int value="82" label="HTMLShadowElementOlderShadowRoot"/>
-  <int value="83" label="Document.all()"/>
+  <int value="83" label="DocumentAll"/>
   <int value="84" label="FormElement"/>
   <int value="85" label="DemotedFormElement"/>
   <int value="86" label="CaptureAttributeAsEnum"/>
@@ -33004,9 +37174,9 @@ other types of suffix sets.
   <int value="181" label="BarPropScrollbars"/>
   <int value="182" label="BarPropStatusbar"/>
   <int value="183" label="BarPropToolbar"/>
-  <int value="184" label="input[type=email][multiple]"/>
-  <int value="185" label="input[type=email][maxlength]"/>
-  <int value="186" label="input[type=email][multiple][maxlength]"/>
+  <int value="184" label="InputTypeEmailMultiple"/>
+  <int value="185" label="InputTypeEmailMaxLength"/>
+  <int value="186" label="InputTypeEmailMultipleMaxLength"/>
   <int value="187" label="TextTrackCueConstructor"/>
   <int value="188" label="CSSStyleDeclarationPropertyName"/>
   <int value="189" label="CSSStyleDeclarationFloatPropertyName"/>
@@ -33102,10 +37272,196 @@ other types of suffix sets.
   <int value="279" label="SVGClassName"/>
   <int value="280" label="HTMLAppletElement"/>
   <int value="281" label="HTMLMediaElementSeekToFragmentStart"/>
-  <int value="282" label="HTMLMediaElementSeekToFragmentEnd"/>
+  <int value="282" label="HTMLMediaElementPauseAtFragmentEnd"/>
   <int value="283" label="PrefixedWindowURL"/>
   <int value="284" label="PrefixedWorkerURL"/>
   <int value="285" label="WindowOrientation"/>
+  <int value="286" label="DOMStringListContains"/>
+  <int value="287" label="DocumentCaptureEvents"/>
+  <int value="288" label="DocumentReleaseEvents"/>
+  <int value="289" label="WindowCaptureEvents"/>
+  <int value="290" label="WindowReleaseEvents"/>
+  <int value="291" label="PrefixedGamepad"/>
+  <int value="292" label="ElementAnimateKeyframeListEffectObjectTiming"/>
+  <int value="293" label="ElementAnimateKeyframeListEffectDoubleTiming"/>
+  <int value="294" label="ElementAnimateKeyframeListEffectNoTiming"/>
+  <int value="295" label="DocumentXPathCreateExpression"/>
+  <int value="296" label="DocumentXPathCreateNSResolver"/>
+  <int value="297" label="DocumentXPathEvaluate"/>
+  <int value="298" label="AttrGetValue"/>
+  <int value="299" label="AttrSetValue"/>
+  <int value="300" label="AnimationConstructorKeyframeListEffectObjectTiming"/>
+  <int value="301" label="AnimationConstructorKeyframeListEffectDoubleTiming"/>
+  <int value="302" label="AnimationConstructorKeyframeListEffectNoTiming"/>
+  <int value="303" label="AttrSetValueWithElement"/>
+  <int value="304" label="PrefixedCancelAnimationFrame"/>
+  <int value="305" label="PrefixedCancelRequestAnimationFrame"/>
+  <int value="306" label="NamedNodeMapGetNamedItem"/>
+  <int value="307" label="NamedNodeMapSetNamedItem"/>
+  <int value="308" label="NamedNodeMapRemoveNamedItem"/>
+  <int value="309" label="NamedNodeMapItem"/>
+  <int value="310" label="NamedNodeMapGetNamedItemNS"/>
+  <int value="311" label="NamedNodeMapSetNamedItemNS"/>
+  <int value="312" label="NamedNodeMapRemoveNamedItemNS"/>
+  <int value="313" label="OpenWebDatabaseInWorker"/>
+  <int value="314" label="OpenWebDatabaseSyncInWorker"/>
+  <int value="315" label="PrefixedAllowFullscreenAttribute"/>
+  <int value="316" label="XHRProgressEventPosition"/>
+  <int value="317" label="XHRProgressEventTotalSize"/>
+  <int value="318" label="PrefixedDocumentIsFullscreen"/>
+  <int value="319" label="PrefixedDocumentFullScreenKeyboardInputAllowed"/>
+  <int value="320" label="PrefixedDocumentCurrentFullScreenElement"/>
+  <int value="321" label="PrefixedDocumentCancelFullScreen"/>
+  <int value="322" label="PrefixedDocumentFullscreenEnabled"/>
+  <int value="323" label="PrefixedDocumentFullscreenElement"/>
+  <int value="324" label="PrefixedDocumentExitFullscreen"/>
+  <int value="325" label="SVGForeignObjectElement"/>
+  <int value="326" label="PrefixedElementRequestPointerLock"/>
+  <int value="327" label="SelectionSetPosition"/>
+  <int value="328" label="AnimationPlayerFinishEvent"/>
+  <int value="329" label="SVGSVGElementInXMLDocument"/>
+  <int value="330" label="CanvasRenderingContext2DSetAlpha"/>
+  <int value="331" label="CanvasRenderingContext2DSetCompositeOperation"/>
+  <int value="332" label="CanvasRenderingContext2DSetLineWidth"/>
+  <int value="333" label="CanvasRenderingContext2DSetLineCap"/>
+  <int value="334" label="CanvasRenderingContext2DSetLineJoin"/>
+  <int value="335" label="CanvasRenderingContext2DSetMiterLimit"/>
+  <int value="336" label="CanvasRenderingContext2DClearShadow"/>
+  <int value="337" label="CanvasRenderingContext2DSetStrokeColor"/>
+  <int value="338" label="CanvasRenderingContext2DSetFillColor"/>
+  <int value="339" label="CanvasRenderingContext2DDrawImageFromRect"/>
+  <int value="340" label="CanvasRenderingContext2DSetShadow"/>
+  <int value="341" label="PrefixedPerformanceClearResourceTimings"/>
+  <int value="342" label="PrefixedPerformanceSetResourceTimingBufferSize"/>
+  <int value="343" label="EventSrcElement"/>
+  <int value="344" label="EventCancelBubble"/>
+  <int value="345" label="EventPath"/>
+  <int value="346" label="EventClipboardData"/>
+  <int value="347" label="NodeIteratorDetach"/>
+  <int value="348" label="AttrNodeValue"/>
+  <int value="349" label="AttrTextContent"/>
+  <int value="350" label="EventGetReturnValueTrue"/>
+  <int value="351" label="EventGetReturnValueFalse"/>
+  <int value="352" label="EventSetReturnValueTrue"/>
+  <int value="353" label="EventSetReturnValueFalse"/>
+  <int value="354" label="NodeIteratorExpandEntityReferences"/>
+  <int value="355" label="TreeWalkerExpandEntityReferences"/>
+  <int value="356" label="WindowOffscreenBuffering"/>
+  <int value="357" label="WindowDefaultStatus"/>
+  <int value="358" label="WindowDefaultstatus"/>
+  <int value="359" label="PrefixedConvertPointFromPageToNode"/>
+  <int value="360" label="PrefixedConvertPointFromNodeToPage"/>
+  <int value="361" label="PrefixedTransitionEventConstructor"/>
+  <int value="362" label="PrefixedMutationObserverConstructor"/>
+  <int value="363" label="PrefixedIDBCursorConstructor"/>
+  <int value="364" label="PrefixedIDBDatabaseConstructor"/>
+  <int value="365" label="PrefixedIDBFactoryConstructor"/>
+  <int value="366" label="PrefixedIDBIndexConstructor"/>
+  <int value="367" label="PrefixedIDBKeyRangeConstructor"/>
+  <int value="368" label="PrefixedIDBObjectStoreConstructor"/>
+  <int value="369" label="PrefixedIDBRequestConstructor"/>
+  <int value="370" label="PrefixedIDBTransactionConstructor"/>
+  <int value="371" label="NotificationPermission"/>
+  <int value="372" label="RangeDetach"/>
+  <int value="373" label="DocumentImportNodeOptionalArgument"/>
+  <int value="374" label="HTMLTableElementVspace"/>
+  <int value="375" label="HTMLTableElementHspace"/>
+  <int value="376" label="PrefixedDocumentExitPointerLock"/>
+  <int value="377" label="PrefixedDocumentPointerLockElement"/>
+  <int value="378" label="PrefixedTouchRadiusX"/>
+  <int value="379" label="PrefixedTouchRadiusY"/>
+  <int value="380" label="PrefixedTouchRotationAngle"/>
+  <int value="381" label="PrefixedTouchForce"/>
+  <int value="382" label="PrefixedMouseEventMovementX"/>
+  <int value="383" label="PrefixedMouseEventMovementY"/>
+  <int value="384" label="PrefixedWheelEventDirectionInvertedFromDevice"/>
+  <int value="385" label="PrefixedWheelEventInit"/>
+  <int value="386" label="PrefixedFileRelativePath"/>
+  <int value="387" label="DocumentCaretRangeFromPoint"/>
+  <int value="388" label="DocumentGetCSSCanvasContext"/>
+  <int value="389" label="ElementScrollIntoViewIfNeeded"/>
+  <int value="390" label="ElementScrollByLines"/>
+  <int value="391" label="ElementScrollByPages"/>
+  <int value="392" label="RangeCompareNode"/>
+  <int value="393" label="RangeExpand"/>
+  <int value="394" label="HTMLFrameElementWidth"/>
+  <int value="395" label="HTMLFrameElementHeight"/>
+  <int value="396" label="HTMLImageElementX"/>
+  <int value="397" label="HTMLImageElementY"/>
+  <int value="398" label="HTMLOptionsCollectionRemoveElement"/>
+  <int value="399" label="HTMLPreElementWrap"/>
+  <int value="400" label="SelectionBaseNode"/>
+  <int value="401" label="SelectionBaseOffset"/>
+  <int value="402" label="SelectionExtentNode"/>
+  <int value="403" label="SelectionExtentOffset"/>
+  <int value="404" label="SelectionType"/>
+  <int value="405" label="SelectionModify"/>
+  <int value="406" label="SelectionSetBaseAndExtent"/>
+  <int value="407" label="SelectionEmpty"/>
+  <int value="408" label="SVGFEMorphologyElementSetRadius"/>
+  <int value="409" label="VTTCue"/>
+  <int value="410" label="VTTCueRender"/>
+  <int value="411" label="VTTCueRenderVertical"/>
+  <int value="412" label="VTTCueRenderSnapToLinesFalse"/>
+  <int value="413" label="VTTCueRenderLineNotAuto"/>
+  <int value="414" label="VTTCueRenderPositionNot50"/>
+  <int value="415" label="VTTCueRenderSizeNot100"/>
+  <int value="416" label="VTTCueRenderAlignNotMiddle"/>
+  <int value="417" label="ElementRequestPointerLock"/>
+  <int value="418" label="VTTCueRenderRtl"/>
+  <int value="419" label="PostMessageFromSecureToInsecure"/>
+  <int value="420" label="PostMessageFromInsecureToSecure"/>
+  <int value="421" label="DocumentExitPointerLock"/>
+  <int value="422" label="DocumentPointerLockElement"/>
+  <int value="423" label="MixedContentFont"/>
+  <int value="424" label="PrefixedCursorZoomIn"/>
+  <int value="425" label="PrefixedCursorZoomOut"/>
+  <int value="426" label="CSSCharsetRuleEncoding"/>
+  <int value="427" label="DocumentSetCharset"/>
+  <int value="428" label="DocumentDefaultCharset"/>
+  <int value="429" label="TextEncoderConstructor"/>
+  <int value="430" label="TextEncoderEncode"/>
+  <int value="431" label="TextDecoderConstructor"/>
+  <int value="432" label="TextDecoderDecode"/>
+  <int value="433" label="FocusInOutEvent"/>
+  <int value="434" label="MouseEventMovementX"/>
+  <int value="435" label="MouseEventMovementY"/>
+  <int value="436" label="MixedContentTextTrack"/>
+  <int value="437" label="MixedContentRaw"/>
+  <int value="438" label="MixedContentImage"/>
+  <int value="439" label="MixedContentMedia"/>
+  <int value="440" label="DocumentFonts"/>
+  <int value="441" label="MixedContentFormsSubmitted"/>
+  <int value="442" label="FormsSubmitted"/>
+  <int value="443" label="TextInputEventOnInput"/>
+  <int value="444" label="TextInputEventOnTextArea"/>
+  <int value="445" label="TextInputEventOnContentEditable"/>
+  <int value="446" label="TextInputEventOnNotNode"/>
+  <int value="447" label="WebkitBeforeTextInsertedOnInput"/>
+  <int value="448" label="WebkitBeforeTextInsertedOnTextArea"/>
+  <int value="449" label="WebkitBeforeTextInsertedOnContentEditable"/>
+  <int value="450" label="WebkitBeforeTextInsertedOnNotNode"/>
+  <int value="451" label="WebkitEditableContentChangedOnInput"/>
+  <int value="452" label="WebkitEditableContentChangedOnTextArea"/>
+  <int value="453" label="WebkitEditableContentChangedOnContentEditable"/>
+  <int value="454" label="WebkitEditableContentChangedOnNotNode"/>
+  <int value="455" label="HTMLImports"/>
+  <int value="456" label="ElementCreateShadowRoot"/>
+  <int value="457" label="DocumentRegisterElement"/>
+  <int value="458" label="EditingAppleInterchangeNewline"/>
+  <int value="459" label="EditingAppleConvertedSpace"/>
+  <int value="460" label="EditingApplePasteAsQuotation"/>
+  <int value="461" label="EditingAppleStyleSpanClass"/>
+  <int value="462" label="EditingAppleTabSpanClass"/>
+  <int value="463" label="HTMLImportsAsyncAttribute"/>
+  <int value="464" label="FontFaceSetReady"/>
+  <int value="465" label="XMLHttpRequestSynchronous"/>
+  <int value="466" label="CSSSelectorPseudoUnresolved"/>
+  <int value="467" label="CSSSelectorPseudoShadow"/>
+  <int value="468" label="CSSSelectorPseudoContent"/>
+  <int value="469" label="CSSSelectorPseudoHost"/>
+  <int value="470" label="CSSSelectorPseudoHostContext"/>
+  <int value="471" label="CSSDeepCombinator"/>
 </enum>
 
 <enum name="FFmpegCodecs" type="int">
@@ -33495,6 +37851,16 @@ other types of suffix sets.
   <int value="6" label="Error"/>
 </enum>
 
+<enum name="FileManagerVolumeType" type="int">
+  <int value="0" label="Google Drive"/>
+  <int value="1" label="Download Folder"/>
+  <int value="2" label="Removable Disk"/>
+  <int value="3" label="Archive File"/>
+  <int value="4" label="Cloud Device"/>
+  <int value="5" label="FileSystemProvider API"/>
+  <int value="6" label="MTP (Media Transfer Protocol) Device"/>
+</enum>
+
 <enum name="FileType" type="int">
   <int value="0" label="other"/>
   <int value="1" label=".doc"/>
@@ -33552,8 +37918,12 @@ other types of suffix sets.
 </enum>
 
 <enum name="FtpServerType" type="int">
+  <obsolete>
+    Deprecated 2012-11-13. No longer generated.
+  </obsolete>
   <summary>
-    FTP server type as defined in net/ftp/ftp_server_type_histograms.h
+    Old FTP server type as previously defined in
+    net/ftp/ftp_server_type_histograms.h
   </summary>
   <int value="0" label="Unknown">
     Unknown (could be a server we don't support, a broken server, or a security
@@ -33573,6 +37943,18 @@ other types of suffix sets.
   </int>
 </enum>
 
+<enum name="FtpServerType2" type="int">
+  <summary>
+    FTP server type as defined in net/ftp/ftp_server_type_histograms.h
+  </summary>
+  <int value="0" label="Unknown"/>
+  <int value="1" label="/bin/ls"/>
+  <int value="2" label="Windows"/>
+  <int value="3" label="VMS"/>
+  <int value="4" label="Netware"/>
+  <int value="5" label="OS/2"/>
+</enum>
+
 <enum name="GaiaSessionRestoreOutcome" type="int">
   <int value="0" label="Undefined"/>
   <int value="1" label="Success"/>
@@ -33622,6 +38004,16 @@ other types of suffix sets.
   <int value="3" label="HTTP Post failed"/>
 </enum>
 
+<enum name="GCMOutgoingMessageTTLCategory" type="int">
+  <int value="0" label="Zero"/>
+  <int value="1" label="Less than or equal to 1 minute"/>
+  <int value="2" label="Less than or equal to 1 hour"/>
+  <int value="3" label="Less than or equal to 1 day"/>
+  <int value="4" label="Less than or equal to 1 week"/>
+  <int value="5" label="More than 1 week but less than maximum"/>
+  <int value="6" label="Default or maximium time"/>
+</enum>
+
 <enum name="GCMRegistrationRequestStatus" type="int">
   <int value="0" label="Success (this is not logged currently)"/>
   <int value="1" label="Invalid parameters"/>
@@ -33689,6 +38081,13 @@ other types of suffix sets.
   <int value="5" label="User ignored the bar"/>
 </enum>
 
+<enum name="GeopositionErrorCode" type="int">
+  <int value="0" label="There was no error"/>
+  <int value="1" label="User denied use of geolocation"/>
+  <int value="2" label="Geoposition could not be determined"/>
+  <int value="3" label="Timeout"/>
+</enum>
+
 <enum name="GestureActionType" type="int">
   <int value="0" label="Unknown"/>
   <int value="1" label="Omnibox pinch"/>
@@ -33755,6 +38154,16 @@ other types of suffix sets.
     Represents a card type ID. See cardTypeId in
     chrome/browser/resources/google_now/background.js.
   </summary>
+  <int value="1" label="Frequent Place"/>
+  <int value="7" label="Weather"/>
+  <int value="12" label="Flight Status"/>
+  <int value="13" label="Sport Score"/>
+  <int value="14" label="Calendar"/>
+  <int value="19" label="Public Alert"/>
+  <int value="21" label="Stock Quote List"/>
+  <int value="23" label="Package Tracking"/>
+  <int value="27" label="Birthday"/>
+  <int value="43" label="Reminder"/>
 </enum>
 
 <enum name="GoogleNowEvent" type="int">
@@ -33794,6 +38203,13 @@ other types of suffix sets.
   <int value="12" label="SERVICE_ERROR"/>
 </enum>
 
+<enum name="HIDContinueScenarioType" type="int">
+  <summary>Possible detected devices combination on leaving dialog</summary>
+  <int value="0" label="Pointing device only detected."/>
+  <int value="1" label="Keyboard device only detected."/>
+  <int value="2" label="Both devices, pointing and keyboard, detected."/>
+</enum>
+
 <enum name="HistoryFaviconsRecoveryEnum" type="int">
   <summary>Error states noted in thumbnail_database.cc recovery code.</summary>
   <int value="0" label="RECOVERY_EVENT_RECOVERED">Successful recovery.</int>
@@ -33927,6 +38343,13 @@ other types of suffix sets.
   <int value="3" label="Disabled"/>
 </enum>
 
+<enum name="HotwordError" type="int">
+  <int value="0" label="No error"/>
+  <int value="1" label="Generic error"/>
+  <int value="2" label="NaCl error"/>
+  <int value="3" label="Microphone error"/>
+</enum>
+
 <enum name="HotwordPrefState" type="int">
   <int value="0" label="Preference not set"/>
   <int value="1" label="Hotwording enabled"/>
@@ -34081,6 +38504,10 @@ other types of suffix sets.
   <int value="21" label="DeleteDatabase"/>
   <int value="22" label="TransactionCommit"/>
   <int value="23" label="GetDatabaseNames"/>
+  <int value="24" label="ReadBlobJournal"/>
+  <int value="25" label="DecodeBlobJournal"/>
+  <int value="26" label="GetBlobKeyGeneratorCurrentNumber"/>
+  <int value="27" label="GetBlobInfoForRecord"/>
 </enum>
 
 <enum name="IDBLevelDBBackingStoreOpenResult" type="int">
@@ -34134,6 +38561,9 @@ other types of suffix sets.
     An open attempt failed with an I/O error that doesn't necessitate a recovery
     attempt.
   </int>
+  <int value="14" label="OpenAttemptPriorCorruption">
+    The corrupted open database was deleted.
+  </int>
 </enum>
 
 <enum name="ImporterType" type="int">
@@ -34148,6 +38578,10 @@ other types of suffix sets.
   </int>
 </enum>
 
+<enum name="IncidentType" type="int">
+  <int value="1" label="TrackedPreference"/>
+</enum>
+
 <enum name="IndexedDatabaseMethods" type="int">
   <int value="0" label="CreateObjectStore()"/>
   <int value="1" label="DeleteObjectStore()"/>
@@ -34163,6 +38597,13 @@ other types of suffix sets.
   <int value="3" label="InfoBar dismissed by clicking the 'X'"/>
 </enum>
 
+<enum name="InjectedAdType" type="int">
+  <int value="0" label="Invalid"/>
+  <int value="1" label="IFrame"/>
+  <int value="2" label="Embed"/>
+  <int value="3" label="Anchor"/>
+</enum>
+
 <enum name="InstantControllerEvent" type="int">
   <int value="0" label="URL_ADDED_TO_BLACKLIST"/>
   <int value="1" label="URL_REMOVED_FROM_BLACKLIST"/>
@@ -34213,6 +38654,20 @@ other types of suffix sets.
   <int value="5" label="Opted out both"/>
 </enum>
 
+<enum name="InstantSearchClicks_PreviewScrollState" type="int">
+  <int value="0" label="No scroll"/>
+  <int value="1" label="Scrolled but not to bottom"/>
+  <int value="2" label="Scrolled to bottom."/>
+</enum>
+
+<enum name="InstantSearchClicks_ReasonForSwap" type="int">
+  <int value="0" label="Regular swap"/>
+  <int value="1" label="Swapped on timeout"/>
+  <int value="2" label="Swap aborted due to navigation"/>
+  <int value="3" label="No swap as preview failed"/>
+  <int value="4" label="Swapped as original failed"/>
+</enum>
+
 <enum name="InstantSessionStorageNamespace" type="int">
   <int value="0" label="different"/>
   <int value="1" label="identical"/>
@@ -34275,6 +38730,7 @@ other types of suffix sets.
   <int value="1" label="PeerConnection00"/>
   <int value="2" label="DeprecatedPeerConnection"/>
   <int value="3" label="RTCPeerConnection"/>
+  <int value="4" label="GetMediaDevices"/>
 </enum>
 
 <enum name="KeyboardControlEvent" type="int">
@@ -34884,6 +39340,36 @@ other types of suffix sets.
   <int value="20" label="GetChildren"/>
 </enum>
 
+<enum name="LevelDBPrefStoreErrorCodes" type="int">
+  <int value="1" label="OPENED"/>
+  <int value="5" label="REPAIRED | OPENED"/>
+  <int value="6" label="REPAIRED | DESTROYED"/>
+  <int value="7" label="REPAIRED | DESTROYED | OPENED"/>
+  <int value="12" label="REPAIRED | DESTROY_FAILED"/>
+  <int value="18" label="REPAIR_FAILED | DESTROYED"/>
+  <int value="19" label="REPAIR_FAILED | DESTROYED | OPENED"/>
+  <int value="24" label="REPAIR_FAILED | DESTROY_FAILED"/>
+  <int value="32" label="IO_ERROR"/>
+  <int value="36" label="REPAIRED | IO_ERROR"/>
+  <int value="38" label="REPAIRED | DESTROYED | IO_ERROR"/>
+  <int value="50" label="REPAIR_FAILED | DESTROYED | IO_ERROR"/>
+  <int value="65" label="OPENED | DATA_LOST"/>
+  <int value="69" label="REPAIRED | OPENED | DATA_LOST"/>
+  <int value="71" label="REPAIRED | DESTROYED | OPENED | DATA_LOST"/>
+  <int value="83" label="REPAIR_FAILED | DESTROYED | OPENED | DATA_LOST"/>
+  <int value="129" label="OPENED | ITER_NOT_OK"/>
+  <int value="133" label="REPAIRED | OPENED | ITER_NOT_OK"/>
+  <int value="135" label="REPAIRED | DESTROYED | OPENED | ITER_NOT_OK"/>
+  <int value="147" label="REPAIR_FAILED | DESTROYED | OPENED | ITER_NOT_OK"/>
+  <int value="193" label="OPENED | DATA_LOST | ITER_NOT_OK"/>
+  <int value="197" label="REPAIRED | OPENED | DATA_LOST | ITER_NOT_OK"/>
+  <int value="199"
+      label="REPAIRED | DESTROYED | OPENED | DATA_LOST | ITER_NOT_OK"/>
+  <int value="211"
+      label="REPAIR_FAILED | DESTROYED | OPENED | DATA_LOST | ITER_NOT_OK"/>
+  <int value="256" label="FILE_NOT_SPECIFIED"/>
+</enum>
+
 <enum name="LinkMonitorFailureType" type="int">
   <int value="0" label="Local MAC Address Not Found"/>
   <int value="1" label="Client Startup Failure"/>
@@ -34911,6 +39397,21 @@ other types of suffix sets.
   <int value="10" label="2.19"/>
 </enum>
 
+<enum name="LinuxWindowManagerName" type="int">
+  <int value="0" label="Other"/>
+  <int value="1" label="Blackbox"/>
+  <int value="2" label="Chrome OS"/>
+  <int value="3" label="Compiz"/>
+  <int value="4" label="Enlightment"/>
+  <int value="5" label="IceWM"/>
+  <int value="6" label="KWin"/>
+  <int value="7" label="Metacity"/>
+  <int value="8" label="Muffin"/>
+  <int value="9" label="Mutter"/>
+  <int value="10" label="Openbox"/>
+  <int value="11" label="Xfwm4"/>
+</enum>
+
 <enum name="LoadType" type="int">
   <int value="0" label="UNDEFINED_LOAD">Not yet initialized</int>
   <int value="1" label="RELOAD">User pressed reload</int>
@@ -35025,6 +39526,11 @@ other types of suffix sets.
   <int value="5" label="OTHER_DEVELOPER">Other Dev</int>
 </enum>
 
+<enum name="MainFrameStorable" type="int">
+  <int value="0" label="Storable"/>
+  <int value="1" label="cache-control: no-store"/>
+</enum>
+
 <enum name="ManagedUserPasswordChange" type="int">
   <int value="0" label="OK_MANAGER">Changed in manager session</int>
   <int value="1" label="OK_MANGED">Changed in supervised user session</int>
@@ -35052,6 +39558,8 @@ other types of suffix sets.
 </enum>
 
 <enum name="MappedCSSProperties" type="int">
+<!-- Generated from ../../../third_party/WebKit/Source/core/frame/UseCounter.cpp -->
+
 <!-- See http://src.chromium.org/viewvc/blink/trunk/Source/core/page/UseCounter.cpp -->
 
   <int value="1" label="Total Pages Measured"/>
@@ -35066,9 +39574,9 @@ other types of suffix sets.
   <int value="10" label="font-weight"/>
   <int value="11" label="text-rendering"/>
   <int value="12" label="webkit-font-feature-settings"/>
-  <int value="13" label="webkit-font-kerning"/>
+  <int value="13" label="font-kerning"/>
   <int value="14" label="webkit-font-smoothing"/>
-  <int value="15" label="webkit-font-variant-ligatures"/>
+  <int value="15" label="font-variant-ligatures"/>
   <int value="16" label="webkit-locale"/>
   <int value="17" label="webkit-text-orientation"/>
   <int value="18" label="webkit-writing-mode"/>
@@ -35283,27 +39791,27 @@ other types of suffix sets.
   <int value="227" label="webkit-columns"/>
   <int value="228" label="webkit-box-decoration-break"/>
   <int value="229" label="webkit-filter"/>
-  <int value="230" label="webkit-align-content"/>
-  <int value="231" label="webkit-align-items"/>
-  <int value="232" label="webkit-align-self"/>
-  <int value="233" label="webkit-flex"/>
-  <int value="234" label="webkit-flex-basis"/>
-  <int value="235" label="webkit-flex-direction"/>
-  <int value="236" label="webkit-flex-flow"/>
-  <int value="237" label="webkit-flex-grow"/>
-  <int value="238" label="webkit-flex-shrink"/>
-  <int value="239" label="webkit-flex-wrap"/>
-  <int value="240" label="webkit-justify-content"/>
+  <int value="230" label="align-content"/>
+  <int value="231" label="align-items"/>
+  <int value="232" label="align-self"/>
+  <int value="233" label="flex"/>
+  <int value="234" label="flex-basis"/>
+  <int value="235" label="flex-direction"/>
+  <int value="236" label="flex-flow"/>
+  <int value="237" label="flex-grow"/>
+  <int value="238" label="flex-shrink"/>
+  <int value="239" label="flex-wrap"/>
+  <int value="240" label="justify-content"/>
   <int value="241" label="webkit-font-size-delta"/>
-  <int value="242" label="webkit-grid-columns"/>
-  <int value="243" label="webkit-grid-rows"/>
-  <int value="244" label="webkit-grid-start"/>
-  <int value="245" label="webkit-grid-end"/>
-  <int value="246" label="webkit-grid-before"/>
-  <int value="247" label="webkit-grid-after"/>
-  <int value="248" label="webkit-grid-column"/>
-  <int value="249" label="webkit-grid-row"/>
-  <int value="250" label="webkit-grid-auto-flow"/>
+  <int value="242" label="grid-template-columns"/>
+  <int value="243" label="grid-template-rows"/>
+  <int value="244" label="grid-column-start"/>
+  <int value="245" label="grid-column-end"/>
+  <int value="246" label="grid-row-start"/>
+  <int value="247" label="grid-row-end"/>
+  <int value="248" label="grid-column"/>
+  <int value="249" label="grid-row"/>
+  <int value="250" label="grid-auto-flow"/>
   <int value="251" label="webkit-highlight"/>
   <int value="252" label="webkit-hyphenate-character"/>
   <int value="253" label="webkit-hyphenate-limit-after"/>
@@ -35356,7 +39864,7 @@ other types of suffix sets.
   <int value="300" label="webkit-min-logical-width"/>
   <int value="301" label="webkit-min-logical-height"/>
   <int value="302" label="webkit-nbsp-mode"/>
-  <int value="303" label="webkit-order"/>
+  <int value="303" label="order"/>
   <int value="304" label="webkit-padding-after"/>
   <int value="305" label="webkit-padding-before"/>
   <int value="306" label="webkit-padding-end"/>
@@ -35395,14 +39903,14 @@ other types of suffix sets.
   <int value="339" label="webkit-user-select"/>
   <int value="340" label="webkit-flow-into"/>
   <int value="341" label="webkit-flow-from"/>
-  <int value="342" label="webkit-region-overflow"/>
+  <int value="342" label="webkit-region-fragment"/>
   <int value="343" label="webkit-region-break-after"/>
   <int value="344" label="webkit-region-break-before"/>
   <int value="345" label="webkit-region-break-inside"/>
-  <int value="346" label="webkit-shape-inside"/>
-  <int value="347" label="webkit-shape-outside"/>
-  <int value="348" label="webkit-shape-margin"/>
-  <int value="349" label="webkit-shape-padding"/>
+  <int value="346" label="shape-inside"/>
+  <int value="347" label="shape-outside"/>
+  <int value="348" label="shape-margin"/>
+  <int value="349" label="shape-padding"/>
   <int value="350" label="webkit-wrap-flow"/>
   <int value="351" label="webkit-wrap-through"/>
   <int value="352" label="webkit-wrap"/>
@@ -35454,11 +39962,11 @@ other types of suffix sets.
   <int value="398" label="image-resolution"/>
   <int value="399" label="webkit-blend-mode"/>
   <int value="400" label="webkit-background-blend-mode"/>
-  <int value="401" label="webkit-text-decoration-line"/>
-  <int value="402" label="webkit-text-decoration-style"/>
-  <int value="403" label="webkit-text-decoration-color"/>
-  <int value="404" label="webkit-text-align-last"/>
-  <int value="405" label="webkit-text-underline-position"/>
+  <int value="401" label="text-decoration-line"/>
+  <int value="402" label="text-decoration-style"/>
+  <int value="403" label="text-decoration-color"/>
+  <int value="404" label="text-align-last"/>
+  <int value="405" label="text-underline-position"/>
   <int value="406" label="max-zoom"/>
   <int value="407" label="min-zoom"/>
   <int value="408" label="orientation"/>
@@ -35476,7 +39984,7 @@ other types of suffix sets.
   <int value="420" label="mix-blend-mode"/>
   <int value="421" label="touch-action"/>
   <int value="422" label="grid-area"/>
-  <int value="423" label="grid-template"/>
+  <int value="423" label="grid-template-areas"/>
   <int value="424" label="animation"/>
   <int value="425" label="animation-delay"/>
   <int value="426" label="animation-direction"/>
@@ -35491,6 +39999,22 @@ other types of suffix sets.
   <int value="435" label="mask-source-type"/>
   <int value="436" label="isolation"/>
   <int value="437" label="object-position"/>
+  <int value="438" label="internal-callback"/>
+  <int value="439" label="shape-image-threshold"/>
+  <int value="440" label="column-fill"/>
+  <int value="441" label="text-justify"/>
+  <int value="442" label="touch-action-delay"/>
+  <int value="443" label="justify-self"/>
+  <int value="444" label="scroll-behavior"/>
+  <int value="445" label="will-change"/>
+  <int value="446" label="transform"/>
+  <int value="447" label="transform-origin"/>
+  <int value="448" label="transform-style"/>
+  <int value="449" label="perspective"/>
+  <int value="450" label="perspective-origin"/>
+  <int value="451" label="backface-visibility"/>
+  <int value="452" label="grid-template"/>
+  <int value="453" label="grid"/>
 </enum>
 
 <enum name="MappedEditingCommands" type="int">
@@ -35703,6 +40227,7 @@ other types of suffix sets.
   <int value="19" label="AddScanResults dialog accepted"/>
   <int value="20" label="Gallery removed from AddScanResults dialog"/>
   <int value="21" label="Gallery removed from permission dialog"/>
+  <int value="22" label="DropPermissionForMediaFileSystem API invocations"/>
 </enum>
 
 <enum name="MediaKeyError" type="int">
@@ -35718,6 +40243,22 @@ other types of suffix sets.
   <int value="3" label="kInvalidPlayerState"/>
 </enum>
 
+<enum name="MediaOutputProtectionStatus" type="int">
+  <int value="0" label="Queried"/>
+  <int value="1" label="No external link"/>
+  <int value="2" label="All external links protected"/>
+</enum>
+
+<enum name="MetaTagTypeEnum" type="int">
+  <int value="0" label="No viewport tag"/>
+  <int value="1" label="Viewport meta with device width"/>
+  <int value="2" label="Viewport meta with constant width"/>
+  <int value="3" label="Viewport meta other"/>
+  <int value="4" label="HandheldFriendly meta"/>
+  <int value="5" label="MobileOptimized meta"/>
+  <int value="6" label="XHTML-MP document type"/>
+</enum>
+
 <enum name="MigrationNssToPemNetworkTypes" type="int">
   <int value="0" label="EAP"/>
   <int value="1" label="OpenVPN"/>
@@ -36045,6 +40586,8 @@ other types of suffix sets.
 </enum>
 
 <enum name="NetErrorCodes" type="int">
+<!-- Generated from ../../../net/base/net_error_list.h -->
+
   <int value="0" label="OK"/>
   <int value="1" label="IO_PENDING"/>
   <int value="2" label="FAILED"/>
@@ -36068,6 +40611,8 @@ other types of suffix sets.
   <int value="20" label="BLOCKED_BY_CLIENT"/>
   <int value="21" label="NETWORK_CHANGED"/>
   <int value="22" label="BLOCKED_BY_ADMINISTRATOR"/>
+  <int value="23" label="SOCKET_IS_CONNECTED"/>
+  <int value="24" label="BLOCKED_ENROLLMENT_CHECK_PENDING"/>
   <int value="100" label="CONNECTION_CLOSED"/>
   <int value="101" label="CONNECTION_RESET"/>
   <int value="102" label="CONNECTION_REFUSED"/>
@@ -36111,7 +40656,7 @@ other types of suffix sets.
   <int value="140" label="HTTPS_PROXY_TUNNEL_RESPONSE"/>
   <int value="141" label="SSL_CLIENT_AUTH_SIGNATURE_FAILED"/>
   <int value="142" label="MSG_TOO_BIG"/>
-  <int value="143" label="KASPERSKY_ANTI_VIRUS_SSL_INTERCEPTION"/>
+  <int value="143" label="SPDY_SESSION_ALREADY_EXISTS"/>
   <int value="144" label="LIMIT_VIOLATION"/>
   <int value="145" label="WS_PROTOCOL_ERROR"/>
   <int value="146" label="PROTOCOL_SWITCHED"/>
@@ -36121,6 +40666,17 @@ other types of suffix sets.
   <int value="150" label="SSL_PINNED_KEY_NOT_IN_CERT_CHAIN"/>
   <int value="151" label="CLIENT_AUTH_CERT_TYPE_UNSUPPORTED"/>
   <int value="152" label="ORIGIN_BOUND_CERT_GENERATION_TYPE_MISMATCH"/>
+  <int value="153" label="SSL_DECRYPT_ERROR_ALERT"/>
+  <int value="154" label="WS_THROTTLE_QUEUE_TOO_LARGE"/>
+  <int value="155" label="TOO_MANY_SOCKET_STREAMS"/>
+  <int value="156" label="SSL_SERVER_CERT_CHANGED"/>
+  <int value="157" label="SSL_INAPPROPRIATE_FALLBACK"/>
+  <int value="158" label="CT_NO_SCTS_VERIFIED_OK"/>
+  <int value="159" label="SSL_UNRECOGNIZED_NAME_ALERT"/>
+  <int value="160" label="SOCKET_SET_RECEIVE_BUFFER_SIZE_ERROR"/>
+  <int value="161" label="SOCKET_SET_SEND_BUFFER_SIZE_ERROR"/>
+  <int value="162" label="SOCKET_RECEIVE_BUFFER_SIZE_UNCHANGEABLE"/>
+  <int value="163" label="SOCKET_SEND_BUFFER_SIZE_UNCHANGEABLE"/>
   <int value="200" label="CERT_COMMON_NAME_INVALID"/>
   <int value="201" label="CERT_DATE_INVALID"/>
   <int value="202" label="CERT_AUTHORITY_INVALID"/>
@@ -36133,6 +40689,8 @@ other types of suffix sets.
   <int value="209" label="CERT_NOT_IN_DNS"/>
   <int value="210" label="CERT_NON_UNIQUE_NAME"/>
   <int value="211" label="CERT_WEAK_KEY"/>
+  <int value="212" label="CERT_NAME_CONSTRAINT_VIOLATION"/>
+  <int value="213" label="CERT_END"/>
   <int value="300" label="INVALID_URL"/>
   <int value="301" label="DISALLOWED_URL_SCHEME"/>
   <int value="302" label="UNKNOWN_URL_SCHEME"/>
@@ -36177,6 +40735,9 @@ other types of suffix sets.
   <int value="355" label="INCOMPLETE_CHUNKED_ENCODING"/>
   <int value="356" label="QUIC_PROTOCOL_ERROR"/>
   <int value="357" label="RESPONSE_HEADERS_TRUNCATED"/>
+  <int value="358" label="QUIC_HANDSHAKE_FAILED"/>
+  <int value="359" label="REQUEST_FOR_SECURE_RESOURCE_OVER_INSECURE_QUIC"/>
+  <int value="360" label="SPDY_INADEQUATE_TRANSPORT_SECURITY"/>
   <int value="400" label="CACHE_MISS"/>
   <int value="401" label="CACHE_READ_FAILURE"/>
   <int value="402" label="CACHE_WRITE_FAILURE"/>
@@ -36184,8 +40745,8 @@ other types of suffix sets.
   <int value="404" label="CACHE_OPEN_FAILURE"/>
   <int value="405" label="CACHE_CREATE_FAILURE"/>
   <int value="406" label="CACHE_RACE"/>
-  <int value="407" label="CACHE_CACHE_CHECKSUM_READ_FAILURE"/>
-  <int value="408" label="CACHE_CACHE_CHECKSUM_MISMATCH"/>
+  <int value="407" label="CACHE_CHECKSUM_READ_FAILURE"/>
+  <int value="408" label="CACHE_CHECKSUM_MISMATCH"/>
   <int value="501" label="INSECURE_RESPONSE"/>
   <int value="502" label="NO_PRIVATE_KEY_FOR_CERT"/>
   <int value="503" label="ADD_USER_CERT_FAILED"/>
@@ -36208,6 +40769,8 @@ other types of suffix sets.
   <int value="710" label="KEY_GENERATION_FAILED"/>
   <int value="711" label="ORIGIN_BOUND_CERT_GENERATION_FAILED"/>
   <int value="712" label="PRIVATE_KEY_EXPORT_FAILED"/>
+  <int value="713" label="SELF_SIGNED_CERT_GENERATION_FAILED"/>
+  <int value="714" label="CERT_DATABASE_CHANGED"/>
   <int value="800" label="DNS_MALFORMED_RESPONSE"/>
   <int value="801" label="DNS_SERVER_REQUIRES_TCP"/>
   <int value="802" label="DNS_SERVER_FAILED"/>
@@ -36217,6 +40780,18 @@ other types of suffix sets.
   <int value="806" label="DNS_SORT_ERROR"/>
 </enum>
 
+<enum name="NetErrorPageEvents" type="int">
+  <int value="0" label="Error Page Shown"/>
+  <int value="1" label="Reload Button Shown"/>
+  <int value="2" label="Reload Button Clicked"/>
+  <int value="3" label="Reload Button Click Load Error"/>
+  <int value="4" label="Load Stale Button Shown"/>
+  <int value="5" label="Load Stale Button Clicked"/>
+  <int value="6" label="Load Stale Button Click Load Error"/>
+  <int value="7" label="More Button Clicked"/>
+  <int value="8" label="Browser Initiated Reload"/>
+</enum>
+
 <enum name="NetPreconnectUtilization" type="int">
   <int value="0" label="non-speculative, never connected"/>
   <int value="1" label="non-speculative, never used"/>
@@ -36439,6 +41014,16 @@ other types of suffix sets.
   <int value="14" label="HTTP_GET_FAILED"/>
 </enum>
 
+<enum name="NetworkTechnology" type="int">
+  <int value="0" label="Cellular"/>
+  <int value="1" label="Ethernet"/>
+  <int value="2" label="Ethernet EAP"/>
+  <int value="3" label="WiFi"/>
+  <int value="4" label="WiMax"/>
+  <int value="5" label="VPN"/>
+  <int value="6" label="Unknown"/>
+</enum>
+
 <enum name="NewTabPageActionAndroid" type="int">
   <int value="0" label="Searched using the omnibox"/>
   <int value="1" label="Navigated to Google search homepage using the omnibox"/>
@@ -36485,7 +41070,7 @@ other types of suffix sets.
 <enum name="NotificationActionType" type="int">
   <int value="0" label="Unknown"/>
   <int value="1" label="Notification added"/>
-  <int value="2" label="Notificaiton updated"/>
+  <int value="2" label="Notification updated"/>
   <int value="3" label="Notification clicked"/>
   <int value="4" label="Notification button clicked"/>
   <int value="5" label="Notification displayed"/>
@@ -36763,7 +41348,7 @@ other types of suffix sets.
 
 <enum name="OsSuite" type="int">
   <int value="0" label="Windows Home Edition"/>
-  <int value="1" label="Windows Proffesional Edition (or better)"/>
+  <int value="1" label="Windows Professional Edition (or better)"/>
   <int value="2" label="Windows Server Edition"/>
 </enum>
 
@@ -36944,6 +41529,13 @@ other types of suffix sets.
   <int value="3" label="Cookie contains both control chars and is invalid"/>
 </enum>
 
+<enum name="PasswordBubbleDisplayDisposition" type="int">
+  <int value="0" label="Opened automatically / Offering a password to save"/>
+  <int value="1" label="Opened manually / Offering a password to save"/>
+  <int value="2" label="Opened manually / Managing saved passwords"/>
+  <int value="3" label="Opened manually / Site is blacklisted"/>
+</enum>
+
 <enum name="PasswordGenerationEvent" type="int">
   <int value="0" label="No sign up form"/>
   <int value="1" label="Local heuristics found sign up form"/>
@@ -37387,12 +41979,30 @@ other types of suffix sets.
   <int value="2" label="Match"/>
 </enum>
 
+<enum name="PasswordManagerUIDismissalReason" type="int">
+  <int value="0" label="Bubble lost focus / No infobar interaction"/>
+  <int value="1" label="Clicked 'Save'"/>
+  <int value="2" label="Clicked 'Nope'"/>
+  <int value="3" label="Clicked 'Never'"/>
+  <int value="4" label="Clicked 'Manage passwords'"/>
+  <int value="5" label="Clicked 'Done'"/>
+  <int value="6" label="Clicked 'Enable password manager'"/>
+</enum>
+
+<enum name="PeerConnectionCounters" type="int">
+  <int value="0" label="PeerConnection enabled with IPv4."/>
+  <int value="1" label="PeerConnection enabled with Ipv6."/>
+  <int value="2" label="IPv4 BestConnection."/>
+  <int value="3" label="IPv6 BestConnection."/>
+</enum>
+
 <enum name="PepperInterface" type="int">
 <!-- Generated by ppapi/tools/pepper_hash_for_uma.cc -->
 
   <int value="286711" label="PPB_FlashFullscreen;0.1"/>
   <int value="2804066" label="PPB_AudioConfig;1.1"/>
   <int value="8760108" label="PPB_Testing_Private;1.0"/>
+  <int value="12033600" label="PPB_Compositor;0.1"/>
   <int value="13662160" label="PPB_CharSet(Dev);0.4"/>
   <int value="22816901" label="PPB_FileChooser(Dev);0.5"/>
   <int value="28187368" label="PPB_IMEInputEvent(Dev);0.2"/>
@@ -37400,12 +42010,14 @@ other types of suffix sets.
   <int value="62905097" label="PPB_TrueTypeFont(Dev);0.1"/>
   <int value="79708274" label="PPB_TCPSocket;1.1"/>
   <int value="110360074" label="PPB_Var;1.1"/>
+  <int value="126651696" label="PPB_ContentDecryptor_Private;0.12"/>
   <int value="138418890" label="PPB_Memory(Dev);0.1"/>
   <int value="153443470" label="PPB_URLResponseInfo;1.0"/>
   <int value="153532707" label="PPB_Buffer(Dev);0.4"/>
   <int value="156766028" label="PPB_UMA_Private;0.3"/>
   <int value="162107265" label="PPB_NetworkMonitor;1.0"/>
   <int value="180906214" label="PPB_Instance_Private;0.1"/>
+  <int value="206043276" label="PPB_CompositorLayer;0.1"/>
   <int value="221802429" label="PPB_URLUtil(Dev);0.7"/>
   <int value="225125520" label="PPB_Find(Private);0.3"/>
   <int value="226206264" label="PPB_FileRef;1.1"/>
@@ -37482,6 +42094,7 @@ other types of suffix sets.
   <int value="1260990020" label="PPB_Ext_Socket(Dev);0.2"/>
   <int value="1262240942" label="PPB_FileIO;1.1"/>
   <int value="1272679676" label="PPB_TCPSocket_Private;0.5"/>
+  <int value="1296231808" label="PPB_VideoDecoder;0.1"/>
   <int value="1316246754" label="PPB_KeyboardInputEvent;1.0"/>
   <int value="1316320941" label="PPB_Graphics2D(Dev);0.1"/>
   <int value="1321620067" label="PPB_Instance;1.0"/>
@@ -37501,6 +42114,7 @@ other types of suffix sets.
   <int value="1519132417" label="PPB_FileSystem;1.0"/>
   <int value="1520420939" label="PPB_MouseCursor;1.0"/>
   <int value="1528832860" label="PPB_FileChooser(Dev);0.6"/>
+  <int value="1577776196" label="PPB_InputEvent_Private;0.1"/>
   <int value="1641037564" label="PPB_VideoSource_Private;0.1"/>
   <int value="1645591549" label="PPB_Widget(Dev);0.3"/>
   <int value="1677958987" label="PPB_ImageData;1.0"/>
@@ -37523,6 +42137,7 @@ other types of suffix sets.
   <int value="1981643755" label="PPB_FileMapping;0.1"/>
   <int value="1994108724" label="PPB_Flash_File_FileRef;2"/>
   <int value="1998274350" label="PPB_Font(Dev);0.6"/>
+  <int value="2001322203" label="PPB_Messaging;1.1"/>
   <int value="2003778556" label="PPB_MouseInputEvent;1.1"/>
   <int value="2005291722" label="PPB_NetAddress_Private;1.1"/>
   <int value="2012645499" label="PPB_Find(Dev);0.3"/>
@@ -37638,11 +42253,18 @@ other types of suffix sets.
   <int value="16" label="I/O"/>
 </enum>
 
+<enum name="PluginAvailabilityStatus" type="int">
+  <int value="0" label="PLUGIN_NOT_REGISTERED"/>
+  <int value="1" label="PLUGIN_AVAILABLE"/>
+  <int value="2" label="PLUGIN_DISABLED"/>
+</enum>
+
 <enum name="PluginLoadResult" type="int">
   <int value="0" label="LOAD_SUCCESS"/>
   <int value="1" label="LOAD_FAILED"/>
   <int value="2" label="ENTRY_POINT_MISSING"/>
   <int value="3" label="INIT_FAILED"/>
+  <int value="4" label="FILE_MISSING"/>
 </enum>
 
 <enum name="PNaClOptionsOptLevelEnum" type="int">
@@ -37844,6 +42466,10 @@ other types of suffix sets.
   <int value="45" label="BAD_DEFERRED_REDIRECT"/>
   <int value="46" label="NAVIGATION_UNCOMMITTED"/>
   <int value="47" label="NEW_NAVIGATION_ENTRY"/>
+  <int value="48" label="COOKIE_STORE_NOT_LOADED"/>
+  <int value="49" label="COOKIE_CONFLICT"/>
+  <int value="50" label="NON_EMPTY_BROWSING_INSTANCE"/>
+  <int value="51" label="NAVIGATION_INTERCEPTED"/>
 </enum>
 
 <enum name="PrerenderHoverEvent" type="int">
@@ -38094,6 +42720,8 @@ other types of suffix sets.
   <int value="6" label="CLOUD_DUPLICATE_SELECTED"/>
   <int value="7" label="REGISTER_PROMO_SHOWN"/>
   <int value="8" label="REGISTER_PROMO_SELECTED"/>
+  <int value="9" label="ACCOUNT_CHANGED"/>
+  <int value="10" label="ADD_ACCOUNT_SELECTED"/>
 </enum>
 
 <enum name="PrintPreviewUserActionType" type="int">
@@ -38134,6 +42762,50 @@ other types of suffix sets.
   <int value="7" label="PRIVET_DISABLE_NOTIFICATIONS_CLICKED"/>
 </enum>
 
+<enum name="ProcessType" type="int">
+  <obsolete>
+    Deprecated 3/2013. No longer generated.
+  </obsolete>
+  <summary>
+    The value for type comes from the ProcessType enum in
+    content/public/common/process_type.h.
+  </summary>
+  <int value="1" label="UNKNOWN"/>
+  <int value="2" label="BROWSER"/>
+  <int value="3" label="RENDER"/>
+  <int value="4" label="PLUGIN"/>
+  <int value="5" label="WORKER"/>
+  <int value="6" label="NACL"/>
+  <int value="7" label="UTILITY"/>
+  <int value="8" label="PROFILE_IMPORT"/>
+  <int value="9" label="ZYGOTE"/>
+  <int value="10" label="SANDBOX_HELPER"/>
+  <int value="11" label="NACL_BROKER_PROCESS"/>
+  <int value="12" label="GPU_PROCESS"/>
+  <int value="13" label="PPAPI_PLUGIN_PROCESS"/>
+</enum>
+
+<enum name="ProcessType2" type="int">
+  <summary>
+    The value for type comes from the ProcessType enum in
+    content/public/common/process_type.h.
+  </summary>
+  <int value="1" label="UNKNOWN"/>
+  <int value="2" label="BROWSER"/>
+  <int value="3" label="RENDER"/>
+  <int value="4" label="PLUGIN"/>
+  <int value="5" label="WORKER"/>
+  <int value="6" label="UTILITY"/>
+  <int value="7" label="ZYGOTE"/>
+  <int value="8" label="SANDBOX_HELPER"/>
+  <int value="9" label="GPU_PROCESS"/>
+  <int value="10" label="PPAPI_PLUGIN_PROCESS"/>
+  <int value="11" label="PPAPI_BROKER_PROCESS"/>
+  <int value="12" label="PROFILE_IMPORT"/>
+  <int value="13" label="NACL"/>
+  <int value="14" label="NACL_BROKER_PROCESS"/>
+</enum>
+
 <enum name="ProfileAddNewUser" type="int">
   <int value="0" label="Add new user from icon menu"/>
   <int value="1" label="Add new user from title bar menu"/>
@@ -38141,6 +42813,33 @@ other types of suffix sets.
   <int value="3" label="Add new user from the User Manager"/>
 </enum>
 
+<enum name="ProfileAndroidAccountManagementMenu" type="int">
+  <int value="0" label="Opened Menu">
+    User arrived at the Account management screen.
+  </int>
+  <int value="1" label="Add Account">
+    User arrived at the Account management screen, and clicked Add account.
+  </int>
+  <int value="2" label="Go Incognito">
+    User arrived at the Account management screen, and clicked Go incognito.
+  </int>
+  <int value="3" label="Primary Account">
+    User arrived at the Account management screen, and clicked on primary.
+  </int>
+  <int value="4" label="Secondary Account">
+    User arrived at the Account management screen, and clicked on secondary.
+  </int>
+  <int value="5" label="Toggled Signout">
+    User arrived at the Account management screen, toggled Chrome signout.
+  </int>
+  <int value="6" label="Confirm Signout">
+    User toggled Chrome signout, and clicked Signout.
+  </int>
+  <int value="7" label="Cancel Signout">
+    User toggled Chrome signout, and clicked Cancel.
+  </int>
+</enum>
+
 <enum name="ProfileAuth" type="int">
   <int value="0" label="Authentication was unnecessary (profile not locked)"/>
   <int value="1" label="Authentication performed using local credentials"/>
@@ -38187,6 +42886,24 @@ other types of suffix sets.
   <int value="4" label="Canceled"/>
 </enum>
 
+<enum name="ProfileDesktopMenu" type="int">
+  <int value="0" label="Locked in Menu">
+    User opened the user menu, and clicked lock.
+  </int>
+  <int value="1" label="Remove Account in Menu">
+    User opened the user menu, and removed an account.
+  </int>
+  <int value="2" label="Add Account in Menu">
+    User opened the user menu, and started adding an account.
+  </int>
+  <int value="3" label="Edit Profile Name in Menu">
+    User opened the user menu, and changed the profile name.
+  </int>
+  <int value="4" label="Edit Profile Image in Menu">
+    User opened the user menu, and started selecting a new profile image.
+  </int>
+</enum>
+
 <enum name="ProfileErrorType" type="int">
   <int value="0" label="History error"/>
   <int value="1" label="Preferences error"/>
@@ -38270,6 +42987,15 @@ other types of suffix sets.
   <int value="1" label="Secondary (user-created) profile"/>
 </enum>
 
+<enum name="ProfileUpgradeEnrollment" type="int">
+  <int value="0" label="User viewed the Upgrade promo card in the user menu."/>
+  <int value="1" label="User selected to view the intro tutorial."/>
+  <int value="2" label="User opted into New Profile Management by Promo card."/>
+  <int value="3" label="User closed the Upgrade card."/>
+  <int value="4" label="User disabled New Profiles Management."/>
+  <int value="5" label="User elected to send feedback."/>
+</enum>
+
 <enum name="ProtectorError" type="int">
   <obsolete>
     Deprecated 8/2013. No longer generated.
@@ -38410,6 +43136,14 @@ other types of suffix sets.
   <int value="58" label="INVALID_BLOCKED_DATA"/>
   <int value="59" label="FLOW_CONTROL_ERROR"/>
   <int value="60" label="INVALID_STOP_WAITING_DATA"/>
+  <int value="61" label="UNENCRYPTED_STREAM_DATA"/>
+  <int value="62" label="CONNECTION_IP_POOLED"/>
+</enum>
+
+<enum name="QuicHandshakeFailureReason" type="int">
+  <int value="0" label="UNKNOWN"/>
+  <int value="1" label="BLACK_HOLE"/>
+  <int value="2" label="PUBLIC_RESET"/>
 </enum>
 
 <enum name="QuicHandshakeState" type="int">
@@ -38618,6 +43352,27 @@ other types of suffix sets.
   <int value="55" label="IDC_CONTENT_CONTEXT_SPELLING_TOGGLE"/>
   <int value="56" label="IDC_SPELLCHECK_LANGUAGES_FIRST"/>
   <int value="57" label="IDC_CONTENT_CONTEXT_SEARCHWEBFORIMAGE"/>
+  <int value="58" label="IDC_SPELLCHECK_SUGGESTION"/>
+</enum>
+
+<enum name="ReportProcessingResult" type="int">
+  <int value="0" label="Success">A report was created and uploaded</int>
+  <int value="1" label="Suppressed">
+    A report was not uploaded because the CSD Whitelist killswitch was present
+  </int>
+  <int value="2" label="InvalidRequest">
+    A report was not uploaded because it could not be serialized
+  </int>
+  <int value="3" label="Cancelled">
+    A report upload was cancelled due to service shutdown
+  </int>
+  <int value="4" label="RequestFailed">A report upload failed</int>
+  <int value="5" label="InvalidResponse">
+    The response from a report upload was invalid
+  </int>
+  <int value="6" label="NoDownload">
+    A report was not uploaded because no binary download was found to report
+  </int>
 </enum>
 
 <enum name="ResolutionCategory" type="int">
@@ -38747,14 +43502,21 @@ other types of suffix sets.
   <int value="5" label="SQLITE_DELETE_FAILED"/>
   <int value="6" label="SQLITE_DELETED_ORIGINAL"/>
   <int value="7" label="SQLITE_DELETE_ORIGINAL_FAILED"/>
+  <int value="8" label="VALIDITY_CHECKSUM_FAILURE"/>
+  <int value="9" label="UPDATE_CHECKSUM_FAILURE"/>
+  <int value="10" label="HEADER_CHECKSUM_FAILURE"/>
 </enum>
 
 <enum name="SB2GetHashResult" type="int">
   <int value="0" label="STATUS_200"/>
   <int value="1" label="STATUS_204"/>
-  <int value="2" label="FULL_HASH_EMPTY"/>
-  <int value="3" label="FULL_HASH_HIT"/>
-  <int value="4" label="FULL_HASH_MISS"/>
+  <int value="2" label="FULL_HASH_EMPTY (sum of STATUS_204, *_ERROR)"/>
+  <int value="3" label="FULL_HASH_HIT (subset of STATUS_200)"/>
+  <int value="4" label="FULL_HASH_MISS (subset of STATUS_200)"/>
+  <int value="5" label="PARSE_ERROR (subset of STATUS_200)"/>
+  <int value="6" label="NETWORK_ERROR"/>
+  <int value="7" label="HTTP_ERROR"/>
+  <int value="8" label="BACKOFF_ERROR"/>
 </enum>
 
 <enum name="SB2InterstitialAction" type="int">
@@ -38889,6 +43651,9 @@ other types of suffix sets.
   <int value="18" label="OTHER"/>
   <int value="19" label="CRX"/>
   <int value="20" label="APK"/>
+  <int value="21" label="DMG"/>
+  <int value="22" label="PKG"/>
+  <int value="23" label="TORRENT"/>
 </enum>
 
 <enum name="SBClientDownloadIsSignedBinary" type="int">
@@ -38959,13 +43724,26 @@ other types of suffix sets.
   <int value="3" label="SCT_STATUS_OK"/>
 </enum>
 
+<enum name="SearchAccessPoint" type="int">
+  <int value="0" label="Omnibox"/>
+  <int value="1" label="Omnibox Instant"/>
+  <int value="2" label="Direct Navigation"/>
+  <int value="3" label="Direct Navigation Instant"/>
+  <int value="4" label="Home Page"/>
+  <int value="5" label="Home Page Instant"/>
+  <int value="6" label="Search App"/>
+  <int value="7" label="Search App Instant"/>
+  <int value="8" label="Other"/>
+  <int value="9" label="Other Instant"/>
+</enum>
+
 <enum name="SearchEngine" type="int">
   <obsolete>
     Deprecated 8/2013. No longer generated.
   </obsolete>
   <summary>
     Indices of most popular prepopulated search engines as defined in
-    chrome/browser/search_engines/search_engine_type.h.
+    components/search_engines/search_engine_type.h.
   </summary>
   <int value="0" label="OTHER"/>
   <int value="1" label="GOOGLE"/>
@@ -39043,6 +43821,26 @@ other types of suffix sets.
   <int value="10" label="SERVICE_UTILITY_SEMANTIC_CAPS_FAILED"/>
 </enum>
 
+<enum name="ServiceWorkerDatabaseStatus" type="int">
+  <int value="0" label="OK"/>
+  <int value="1" label="Not Found Error"/>
+  <int value="2" label="IO Error"/>
+  <int value="3" label="Corruption Error"/>
+  <int value="4" label="Operation Error"/>
+</enum>
+
+<enum name="ServiceWorkerReadResponseResult" type="int">
+  <int value="0" label="OK"/>
+  <int value="1" label="Read headers error"/>
+  <int value="2" label="Read data error"/>
+</enum>
+
+<enum name="ServiceWorkerWriteResponseResult" type="int">
+  <int value="0" label="OK"/>
+  <int value="1" label="Write headers error"/>
+  <int value="2" label="Write data error"/>
+</enum>
+
 <enum name="SessionStartupPref" type="int">
   <int value="0" label="Open home page (unused)"/>
   <int value="1" label="Continue from last opened pages"/>
@@ -39120,6 +43918,60 @@ other types of suffix sets.
   <int value="13" label="Learn more undo"/>
 </enum>
 
+<enum name="SigninHelperFlow" type="int">
+  <int value="0" label="Shown">The signin flow was shown to the user.</int>
+  <int value="1" label="Accepted">The user pressed accept to sign in.</int>
+  <int value="2" label="Rejected">The user pressed the reject to sign in.</int>
+  <int value="3" label="Dismissed">
+    The user pressed the X button to dismiss the signin promo.
+  </int>
+  <int value="4" label="Ignored">
+    The user completely ignored the signin promo. Either they navigated away, or
+    they used the page as is.
+  </int>
+  <int value="5" label="Learn More">
+    The user clicked on the learn more link in the signin promo.
+  </int>
+  <int value="6" label="Accept with Defaults">
+    The sync was started with default settings.
+  </int>
+  <int value="7" label="Accept with Advanced">
+    The sync was started with advanced settings.
+  </int>
+  <int value="8" label="Auto-Accept with Defaults">
+    The sync was started through auto-accept with default settings.
+  </int>
+  <int value="9" label="Auto-Accept with Advanced">
+    The sync was started through auto-accept with advanced settings.
+  </int>
+  <int value="10" label="Undo">The sync was aborted with an undo button.</int>
+</enum>
+
+<enum name="SigninSignoutProfile" type="int">
+  <int value="0" label="Preference changed">
+    The preference or policy controlling if signin is valid has changed.
+  </int>
+  <int value="1" label="Google service pattern changed">
+    The valid username pattern for signing in to the Google service changed.
+  </int>
+  <int value="2" label="Signin preference changed during signin">
+    The preference or policy controlling if signin is valid changed during the
+    signin process.
+  </int>
+  <int value="3" label="User clicked signout">User clicked to signout.</int>
+  <int value="4" label="Signin aborted">
+    The signin process was aborted, but signin had succeeded, so signout. This
+    may be due to a server response, policy definition or user action.
+  </int>
+  <int value="5" label="Server forced">
+    The sync server caused the profile to be signed out.
+  </int>
+  <int value="6" label="Credentials transfered">
+    The credentials are being transfered to a new profile, so the old one is
+    signed out.
+  </int>
+</enum>
+
 <enum name="SimpleCache.EntryCreatedAndStream2Omitted" type="int">
   <int value="0" label="Stream 2 file was present"/>
   <int value="1" label="Empty stream 2 file was omitted"/>
@@ -39232,6 +44084,21 @@ other types of suffix sets.
   <int value="5" label="Fast Empty Return (Success)"/>
 </enum>
 
+<enum name="SimpleGeolocationRequestEvent" type="int">
+  <int value="0" label="Request start"/>
+  <int value="1" label="Response success"/>
+  <int value="2" label="Response not OK"/>
+  <int value="3" label="Response empty"/>
+  <int value="4" label="Response malformed"/>
+</enum>
+
+<enum name="SimpleGeolocationRequestResult" type="int">
+  <int value="0" label="Success"/>
+  <int value="1" label="Failure"/>
+  <int value="2" label="Server error"/>
+  <int value="3" label="Request is cancelled."/>
+</enum>
+
 <enum name="SimpleIndexState" type="int">
   <int value="0" label="Corrupt"/>
   <int value="1" label="Stale"/>
@@ -39266,11 +44133,12 @@ other types of suffix sets.
 </enum>
 
 <enum name="SocketStreamConnectionType" type="int">
-  <int value="0" label="none"/>
-  <int value="1" label="all connections"/>
-  <int value="2" label="tunnel connections"/>
-  <int value="3" label="socks connections"/>
-  <int value="4" label="ssl connections"/>
+  <int value="0" label="None"/>
+  <int value="1" label="All"/>
+  <int value="2" label="Tunnel"/>
+  <int value="3" label="SOCKS"/>
+  <int value="4" label="SSL"/>
+  <int value="5" label="Secure proxy"/>
 </enum>
 
 <enum name="SocketStreamProtocolType" type="int">
@@ -39367,6 +44235,13 @@ other types of suffix sets.
   <int value="29" label="GoAway Frame Corrupt"/>
   <int value="30" label="RstStream Frame Corrupt"/>
   <int value="31" label="Unexpected Frame (Expected Continuation)"/>
+<!-- More SpdyRstStreamStatus -->
+
+  <int value="32" label="Timeout waiting for settings acknowledgement"/>
+  <int value="33"
+      label="Connection established in response to CONNECT request was
+             abnormally closed"/>
+  <int value="34" label="Peer exhibiting suspect behavior."/>
 </enum>
 
 <enum name="SpdySessionGet" type="int">
@@ -40079,6 +44954,22 @@ other types of suffix sets.
   <int value="3" label="Attempted"/>
 </enum>
 
+<enum name="SwReporterExitCode" type="int">
+  <int value="0" label="Success / Found"/>
+  <int value="1" label="Failed"/>
+  <int value="2" label="Nothing Found"/>
+</enum>
+
+<enum name="SwReporterStep" type="int">
+  <int value="0" label="Explicit request"/>
+  <int value="1" label="Startup retry"/>
+  <int value="2" label="Retried too many times"/>
+  <int value="3" label="Start execution"/>
+  <int value="4" label="Failed to start"/>
+  <int value="5" label="Registry exit code"/>
+  <int value="6" label="Reset retries"/>
+</enum>
+
 <enum name="SyncAuthError" type="int">
   <int value="0"
       label="Number of times clients have encountered an Auth error."/>
@@ -40275,6 +45166,12 @@ other types of suffix sets.
   <int value="5" label="Actionable error"/>
 </enum>
 
+<enum name="TabBackgroundLoadStatus" type="int">
+  <int value="0" label="Loaded on creation and shown"/>
+  <int value="1" label="Loaded on creation and lost"/>
+  <int value="2" label="Not loaded on creation"/>
+</enum>
+
 <enum name="TabRestoreResult" type="int">
   <int value="0" label="Failure (other)"/>
   <int value="1" label="Success"/>
@@ -40302,11 +45199,17 @@ other types of suffix sets.
 </enum>
 
 <enum name="TabSwitchedToForegroundLaunchedWithURL" type="int">
+  <obsolete>
+    Deprecated as of 04/2014.
+  </obsolete>
   <int value="0" label="Launched without an URL"/>
   <int value="1" label="Launched with an URL"/>
 </enum>
 
 <enum name="TabSwitchedToForegroundRevisit" type="int">
+  <obsolete>
+    Deprecated as of 04/2014.
+  </obsolete>
   <int value="0" label="First time"/>
   <int value="1" label="Revisit"/>
 </enum>
@@ -40397,6 +45300,10 @@ other types of suffix sets.
   <int value="11" label="prefs::kPinnedTabs"/>
   <int value="12" label="extensions::pref_names::kKnownDisabled"/>
   <int value="13" label="prefs::kProfileResetPromptMemento"/>
+  <int value="14"
+      label="DefaultSearchManager::kDefaultSearchProviderDataPrefName"/>
+  <int value="15" label="prefs::kPreferenceResetTime"/>
+  <int value="16" label="prefs::kSafeBrowsingIncidentReportSent"/>
 </enum>
 
 <enum name="TranslateError" type="int">
@@ -40481,6 +45388,7 @@ other types of suffix sets.
   <int value="32" label="Show Press"/>
   <int value="33" label="Tap Cancel"/>
   <int value="34" label="Edge swipe"/>
+  <int value="35" label="One-finger swipe"/>
 </enum>
 
 <enum name="UmaInitSequence" type="int">
@@ -40520,6 +45428,74 @@ other types of suffix sets.
   <int value="3" label="Group not reported and trial was disabled"/>
 </enum>
 
+<enum name="UpdateEngineAttemptResult" type="int">
+  <int value="0" label="Update Succeeded"/>
+  <int value="1" label="Internal Error"/>
+  <int value="2" label="Payload Download Error"/>
+  <int value="3" label="Metadata Malformed"/>
+  <int value="4" label="Operation Malformed"/>
+  <int value="5" label="Operation Execution Error"/>
+  <int value="6" label="Metadata Verification Failed"/>
+  <int value="7" label="Payload Verification Failed"/>
+  <int value="8" label="Verification Failed"/>
+  <int value="9" label="Post-install Failed"/>
+  <int value="10" label="Abnormal Termination"/>
+</enum>
+
+<enum name="UpdateEngineCheckReaction" type="int">
+  <int value="0" label="Updating"/>
+  <int value="1" label="Ignoring"/>
+  <int value="2" label="Deferring"/>
+  <int value="3" label="Backing Off"/>
+</enum>
+
+<enum name="UpdateEngineCheckResult" type="int">
+  <int value="0" label="Update Available"/>
+  <int value="1" label="No Update Available"/>
+  <int value="2" label="Response Download Error"/>
+  <int value="3" label="Response Parsing Error"/>
+  <int value="4" label="Reboot Pending"/>
+</enum>
+
+<enum name="UpdateEngineConnectionType" type="int">
+  <int value="0" label="Unknown"/>
+  <int value="1" label="Ethernet"/>
+  <int value="2" label="Wifi"/>
+  <int value="3" label="WiMAX"/>
+  <int value="4" label="Bluetooth"/>
+  <int value="5" label="Cellular"/>
+  <int value="6" label="Tethered (Ethernet)"/>
+  <int value="7" label="Tethered (Wifi)"/>
+</enum>
+
+<enum name="UpdateEngineDownloadErrorCode" type="int">
+  <int value="0" label="Download Error"/>
+  <int value="100" label="Input Malformed (Internal Error)"/>
+  <int value="101" label="Unknown HTTP Status (not 200-599)"/>
+  <int value="400" label="Bad Request (HTTP Status 400)"/>
+  <int value="401" label="Unauthorized (HTTP Status 401)"/>
+  <int value="402" label="Payment Required (HTTP Status 402)"/>
+  <int value="403" label="Forbidden (HTTP Status 403)"/>
+  <int value="404" label="Not Found (HTTP Status 404)"/>
+  <int value="405" label="Method Not Allowed (HTTP Status 405)"/>
+  <int value="406" label="Not Acceptable (HTTP Status 406)"/>
+  <int value="407" label="Proxy Auth Req (HTTP Status 407)"/>
+  <int value="408" label="Request Timeout (HTTP Status 408)"/>
+  <int value="409" label="Conflict (HTTP Status 409)"/>
+  <int value="410" label="Gone (HTTP Status 410)"/>
+  <int value="500" label="Internal Server Error (HTTP Status 500)"/>
+  <int value="501" label="Not Implemented (HTTP Status 501)"/>
+  <int value="502" label="Bad Gateway (HTTP Status 502)"/>
+  <int value="503" label="Service Unavailable (HTTP Status 503)"/>
+  <int value="504" label="Gateway Timeout (HTTP Status 504)"/>
+</enum>
+
+<enum name="UpdateEngineDownloadSource" type="int">
+  <int value="0" label="HTTPS Server"/>
+  <int value="1" label="HTTP Server"/>
+  <int value="2" label="HTTP Peer"/>
+</enum>
+
 <enum name="UpdateEngineDownloadSources" type="int">
   <int value="0" label="Other"/>
   <int value="1" label="HTTPS Server Only"/>
@@ -40575,6 +45551,9 @@ other types of suffix sets.
   <int value="40" label="kErrorCodeOmahaUpdateDeferredForBackoff"/>
   <int value="41" label="kErrorCodePostinstallPowerwashError"/>
   <int value="42" label="kErrorCodeUpdateCanceledByChannelChange"/>
+  <int value="43" label="kErrorCodePostinstallFirmwareRONotUpdatable"/>
+  <int value="44" label="kErrorCodeUnsupportedMajorPayloadVersion"/>
+  <int value="45" label="kErrorCodeUnsupportedMinorPayloadVersion"/>
 </enum>
 
 <enum name="UpdateEngineInstallDateProvisioningSource" type="int">
@@ -40615,6 +45594,10 @@ other types of suffix sets.
   <int value="10" label="kFileSystemScheme"/>
 </enum>
 
+<enum name="UserInitiatedEvent" type="int">
+  <int value="0" label="WiFi Scan"/>
+</enum>
+
 <enum name="UserSelectableSyncType" type="int">
   <int value="0" label="Bookmarks"/>
   <int value="1" label="Preferences"/>
@@ -40841,6 +45824,20 @@ other types of suffix sets.
   <int value="2" label="Served from data URL"/>
 </enum>
 
+<enum name="WebFontDiskCacheHit" type="int">
+  <int value="0" label="Not in the cache"/>
+  <int value="1" label="In the cache"/>
+  <int value="2" label="Previously in the cache"/>
+</enum>
+
+<enum name="WebFontPackageFormat" type="int">
+  <int value="0" label="Unknown / Decode error"/>
+  <int value="1" label="SFNT"/>
+  <int value="2" label="WOFF"/>
+  <int value="3" label="WOFF 2.0"/>
+  <int value="4" label="SVG"/>
+</enum>
+
 <enum name="WebFontUsageType" type="int">
   <int value="0" label="Styled, and used"/>
   <int value="1" label="Styled, but not used"/>
@@ -40860,9 +45857,27 @@ other types of suffix sets.
   <int value="3" label="Connected"/>
 </enum>
 
+<enum name="WebSocketNewHandshakeResult" type="int">
+  <int value="0" label="INCOMPLETE">Incomplete</int>
+  <int value="1" label="CONNECTED">Connected</int>
+  <int value="2" label="FAILED">Failed</int>
+</enum>
+
+<enum name="WebSocketNewPerMessageDeflateContextTakeoverMode" type="int">
+  <int value="0" label="Do not take over"/>
+  <int value="1" label="Take over"/>
+</enum>
+
 <enum name="WebSocketPerMessageDeflateContextTakeOverMode" type="int">
-  <int value="0" label="DoNotTakeOverContext"/>
-  <int value="1" label="TakeOverContext"/>
+  <int value="0" label="Do not take over"/>
+  <int value="1" label="Take over"/>
+</enum>
+
+<enum name="WebSocketSendType" type="int">
+  <int value="0" label="String"/>
+  <int value="1" label="ArrayBuffer"/>
+  <int value="2" label="ArrayBufferView"/>
+  <int value="3" label="Blob"/>
 </enum>
 
 <enum name="WiFiApMode" type="int">
@@ -40965,58 +45980,65 @@ other types of suffix sets.
 
 </enums>
 
-<!-- Field trials -->
+<!-- Histogram suffixes list -->
 
-<fieldtrials>
+<histogram_suffixes_list>
 
-<fieldtrial name="ActiveNetworkState">
-  <group name="Offline"
+<histogram_suffixes name="ActiveNetworkState">
+  <suffix name="Offline"
       label="network manager thinks that the active network is offline"/>
-  <group name="Online"
+  <suffix name="Online"
       label="network manager thinks that the active network is online"/>
-  <group name="RestrictedPool"
+  <suffix name="RestrictedPool"
       label="network manager thinks that the active network is behind portal"/>
   <affected-histogram name="CaptivePortal.OOBE.DiscrepancyWithShill"/>
   <affected-histogram name="CaptivePortal.Session.DiscrepancyWithShill"/>
-</fieldtrial>
-
-<fieldtrial name="AsyncSlowStart">
-  <group name="AsyncSlowStart" label="Async Slow Start on"/>
-  <group name="AsyncSlowStart_off" label="Async Slow Start off"/>
-  <group name="AsyncSlowStart_on" label="Async Slow Start on"/>
+</histogram_suffixes>
+
+<histogram_suffixes name="AppListFirstPaintWarmStartFast" separator="">
+  <suffix name="" label="Normal start."/>
+  <suffix name="Fast"
+      label="Fast start by skipping normal chrome.dll startup."/>
+  <affected-histogram name="Startup.AppListFirstPaintWarmStart"/>
+</histogram_suffixes>
+
+<histogram_suffixes name="AsyncSlowStart">
+  <suffix name="AsyncSlowStart" label="Async Slow Start on"/>
+  <suffix name="AsyncSlowStart_off" label="Async Slow Start off"/>
+  <suffix name="AsyncSlowStart_on" label="Async Slow Start on"/>
   <affected-histogram name="Net.Transaction_Connected_New"/>
   <affected-histogram name="Renderer4.StartToFinish"/>
-</fieldtrial>
-
-<fieldtrial name="AutofillServerExperiments">
-  <group name="ar06" label="Acceptance ratio: 0.6"/>
-  <group name="ar1" label="Acceptance ratio: 1.0"/>
-  <group name="ar2" label="Acceptance ratio: 2.0"/>
-  <group name="ar4" label="Acceptance ratio: 4.0"/>
-  <group name="ar04wr3fs4"
+</histogram_suffixes>
+
+<histogram_suffixes name="AutofillServerExperiments">
+  <suffix name="ar06" label="Acceptance ratio: 0.6"/>
+  <suffix name="ar1" label="Acceptance ratio: 1.0"/>
+  <suffix name="ar2" label="Acceptance ratio: 2.0"/>
+  <suffix name="ar4" label="Acceptance ratio: 4.0"/>
+  <suffix name="ar04wr3fs4"
       label="Acceptance ratio: 0.4; winner lead ratio: 3.0; min form score: 4"/>
-  <group name="ar05wlr15"
+  <suffix name="ar05wlr15"
       label="Acceptance ratio: 0.5; winner lead ratio: 1.5"/>
-  <group name="ar05wlr25"
+  <suffix name="ar05wlr25"
       label="Acceptance ratio: 0.5; winner lead ratio: 2.5"/>
-  <group name="ar05wr15fs5"
+  <suffix name="ar05wr15fs5"
       label="Acceptance ratio: 0.5; winner lead ratio: 1.5; min form score: 5"/>
-  <group name="fp05" label="Probability picker algorithm, p=0.5"/>
-  <group name="fp025" label="Probability picker algorithm, p=0.25"/>
-  <group name="fp05cc03"
+  <suffix name="fp05" label="Probability picker algorithm, p=0.5"/>
+  <suffix name="fp025" label="Probability picker algorithm, p=0.25"/>
+  <suffix name="fp05cc03"
       label="Probability picker algorithm, p=0.5; p_ccname=0.3"/>
-  <group name="fp05cco03"
+  <suffix name="fp05cco03"
       label="Probability picker algorithm, p=0.5;
              p_ccname_given_other_cc_fields=0.3"/>
-  <group name="fp05cco03cstd"
+  <suffix name="fp05cco03cstd"
       label="Probability picker algorithm, p=0.5;
              p_ccname_given_other_cc_fields=0.3; with fallback to the default
              algorithm"/>
-  <group name="fp05cc03e1"
+  <suffix name="fp05cc03e1"
       label="Probability picker algorithm, p=0.5 for cc and company name
              fields; p_ccname_given_other_cc_fields=0.3; with fallback to the
              default algorithm;"/>
-  <group name="tbar1" label="Use only Toolbar upload data"/>
+  <suffix name="tbar1" label="Use only Toolbar upload data"/>
   <affected-histogram name="Autofill.Quality"/>
   <affected-histogram name="AutoFill.Quality"/>
   <affected-histogram name="Autofill.Quality.HeuristicType"/>
@@ -41025,12 +46047,33 @@ other types of suffix sets.
   <affected-histogram name="Autofill.Quality.PredictedType.ByFieldType"/>
   <affected-histogram name="Autofill.Quality.ServerType"/>
   <affected-histogram name="Autofill.Quality.ServerType.ByFieldType"/>
-</fieldtrial>
-
-<fieldtrial name="CacheListSize">
-  <group name="CacheListSize_12" label="Control"/>
-  <group name="CacheListSize_13" label="Extended deleted list (2x)"/>
-  <group name="CacheListSize_14" label="Out of the experiment"/>
+</histogram_suffixes>
+
+<histogram_suffixes name="BadBlockCounts" separator=".">
+  <suffix name="Backupsys" label="backupsys partition"/>
+  <suffix name="Bbt" label="bbt partition"/>
+  <suffix name="Block0" label="block0 partition"/>
+  <suffix name="Bootloader" label="bootloader partition"/>
+  <suffix name="Cache" label="cache partition"/>
+  <suffix name="Factory_store" label="factory_store partition"/>
+  <suffix name="Fts" label="fts partition"/>
+  <suffix name="Kernel" label="kernel partition"/>
+  <suffix name="Postbootloader" label="postbootloader partition"/>
+  <suffix name="Postbootloader-B" label="postbootloader-B partition"/>
+  <suffix name="Prebootloader" label="prebootloader partition"/>
+  <suffix name="Recovery" label="recovery partition"/>
+  <suffix name="Rootfs" label="rootfs partition"/>
+  <suffix name="Total" label="total partition"/>
+  <suffix name="TZ" label="TZ partition"/>
+  <suffix name="TZ-B" label="TZ-B partition"/>
+  <suffix name="Userdata" label="userdata partition"/>
+  <affected-histogram name="Platform.Storage.Flash.BadBlocks"/>
+</histogram_suffixes>
+
+<histogram_suffixes name="CacheListSize">
+  <suffix name="CacheListSize_12" label="Control"/>
+  <suffix name="CacheListSize_13" label="Extended deleted list (2x)"/>
+  <suffix name="CacheListSize_14" label="Out of the experiment"/>
   <affected-histogram name="DiskCache.TotalIOTime"/>
   <affected-histogram name="Net.HttpJob.TotalTime"/>
   <affected-histogram name="Net.HttpJob.TotalTimeCached"/>
@@ -41046,20 +46089,20 @@ other types of suffix sets.
   <affected-histogram name="PLT.BeginToFinish_LinkLoadStaleOk"/>
   <affected-histogram name="PLT.BeginToFinish_NormalLoad"/>
   <affected-histogram name="PLT.BeginToFinish_Reload"/>
-</fieldtrial>
-
-<fieldtrial name="CacheSensitivityAnalysis">
-  <group name="No" label="Turned off"/>
-  <group name="Control" label="Control group"/>
-  <group name="ControlA" label="Control, Group A"/>
-  <group name="ControlB" label="Control, Group B"/>
-  <group name="100" label="100% slowdown"/>
-  <group name="100A" label="100% slowdown, Group A"/>
-  <group name="100B" label="100% slowdown, Group B"/>
-  <group name="200A" label="200% slowdown, Group A"/>
-  <group name="200B" label="200% slowdown, Group B"/>
-  <group name="400A" label="400% slowdown, Group A"/>
-  <group name="400B" label="400% slowdown, Group B"/>
+</histogram_suffixes>
+
+<histogram_suffixes name="CacheSensitivityAnalysis">
+  <suffix name="No" label="Turned off"/>
+  <suffix name="Control" label="Control group"/>
+  <suffix name="ControlA" label="Control, Group A"/>
+  <suffix name="ControlB" label="Control, Group B"/>
+  <suffix name="100" label="100% slowdown"/>
+  <suffix name="100A" label="100% slowdown, Group A"/>
+  <suffix name="100B" label="100% slowdown, Group B"/>
+  <suffix name="200A" label="200% slowdown, Group A"/>
+  <suffix name="200B" label="200% slowdown, Group B"/>
+  <suffix name="400A" label="400% slowdown, Group A"/>
+  <suffix name="400B" label="400% slowdown, Group B"/>
   <affected-histogram name="Net.HttpJob.TotalTime"/>
   <affected-histogram name="Net.HttpJob.TotalTimeCached"/>
   <affected-histogram name="Net.HttpJob.TotalTimeCancel"/>
@@ -41069,24 +46112,25 @@ other types of suffix sets.
   <affected-histogram name="PLT.BeginToFinishDoc_CacheSensitivity"/>
   <affected-histogram name="PLT.BeginToFirstPaint_CacheSensitivity"/>
   <affected-histogram name="PLT.CommitToFirstPaint_CacheSensitivity"/>
-</fieldtrial>
+</histogram_suffixes>
 
-<fieldtrial name="CacheSensitivityHistograms">
-  <group name="CacheSensitivity" label="Cache Sensivitiy Analysis"/>
+<histogram_suffixes name="CacheSensitivityHistograms">
+  <suffix name="CacheSensitivity" label="Cache Sensivitiy Analysis"/>
   <affected-histogram name="PLT.BeginToFinish"/>
   <affected-histogram name="PLT.BeginToFinishDoc"/>
   <affected-histogram name="PLT.BeginToFirstPaint"/>
   <affected-histogram name="PLT.CommitToFirstPaint"/>
-</fieldtrial>
-
-<fieldtrial name="CertificateTypeAlgorithms" separator=".">
-  <group name="DH" label="DH"/>
-  <group name="DSA" label="DSA"/>
-  <group name="ECDH" label="ECDH"/>
-  <group name="ECDSA" label="ECDSA"/>
-  <group name="RSA" label="RSA"/>
-  <group name="Unknown" label="SPKI unrecognized by cert library"/>
-  <group name="Unsupported" label="Un-histogrammed type - please fix"/>
+</histogram_suffixes>
+
+<histogram_suffixes name="CertificateTypeAlgorithms" separator=".">
+  <owner>rsleevi@chromium.org</owner>
+  <suffix name="DH" label="DH"/>
+  <suffix name="DSA" label="DSA"/>
+  <suffix name="ECDH" label="ECDH"/>
+  <suffix name="ECDSA" label="ECDSA"/>
+  <suffix name="RSA" label="RSA"/>
+  <suffix name="Unknown" label="SPKI unrecognized by cert library"/>
+  <suffix name="Unsupported" label="Un-histogrammed type - please fix"/>
   <affected-histogram name="CertificateType.BR.Intermediate"/>
   <affected-histogram name="CertificateType.BR.Leaf"/>
   <affected-histogram name="CertificateType.BR.Root"/>
@@ -41099,9 +46143,9 @@ other types of suffix sets.
   <affected-histogram name="CertificateType2.NonBR.Intermediate"/>
   <affected-histogram name="CertificateType2.NonBR.Leaf"/>
   <affected-histogram name="CertificateType2.NonBR.Root"/>
-</fieldtrial>
+</histogram_suffixes>
 
-<fieldtrial name="CertificateTypeBRValidity" separator=".">
+<histogram_suffixes name="CertificateTypeBRValidity" separator=".">
   <obsolete>
     Deprecated as of 8/2013. This histogram only considered the leaf certificate
     expiry date as a proxy for whether a certificate was in-scope for the BRs,
@@ -41110,57 +46154,57 @@ other types of suffix sets.
     being subject to the BRs, but non-compliant, when in reality they're not
     subject.
   </obsolete>
-  <group name="BR"
+  <suffix name="BR"
       label="The *leaf* certificate of the chain expires after 2013-12-31,
              meaning that it should be in scope for the Baseline
              Requirement's key size requirements"/>
-  <group name="NonBR"
+  <suffix name="NonBR"
       label="The *leaf* certificate of the chain expires on or before
              2013-12-31"/>
   <affected-histogram name="CertificateType"/>
-</fieldtrial>
+</histogram_suffixes>
 
-<fieldtrial name="CertificateTypeBRValidity2" separator=".">
-  <group name="BR"
+<histogram_suffixes name="CertificateTypeBRValidity2" separator=".">
+  <suffix name="BR"
       label="The *leaf* certificate of the chain expires after 2013-12-31 and
              was issued on or after 2012-07-01, as judged by the notBefore,
              meaning that it should be in scope for the Baseline
              Requirement's key size requirements"/>
-  <group name="NonBR"
+  <suffix name="NonBR"
       label="The *leaf* certificate of the chain expires on or before
              2013-12-31 or was issued before 2012-07-01"/>
   <affected-histogram name="CertificateType2"/>
-</fieldtrial>
+</histogram_suffixes>
 
-<fieldtrial name="CertificateTypeChainPosition" separator=".">
-  <group name="Intermediate" label="Intermediate's SPKI"/>
-  <group name="Leaf" label="Leaf's SPKI"/>
-  <group name="Root" label="Root's SPKI"/>
+<histogram_suffixes name="CertificateTypeChainPosition" separator=".">
+  <suffix name="Intermediate" label="Intermediate's SPKI"/>
+  <suffix name="Leaf" label="Leaf's SPKI"/>
+  <suffix name="Root" label="Root's SPKI"/>
   <affected-histogram name="CertificateType.BR"/>
   <affected-histogram name="CertificateType.NonBR"/>
   <affected-histogram name="CertificateType2.BR"/>
   <affected-histogram name="CertificateType2.NonBR"/>
-</fieldtrial>
+</histogram_suffixes>
 
-<fieldtrial name="CloudPrintRequests" separator=".">
-  <group name="Register" label="Register request"/>
-  <group name="UpdatePrinter" label="Update printer request"/>
-  <group name="DownloadData" label="Download data request"/>
-  <group name="Other" label="Other requests"/>
+<histogram_suffixes name="CloudPrintRequests" separator=".">
+  <suffix name="Register" label="Register request"/>
+  <suffix name="UpdatePrinter" label="Update printer request"/>
+  <suffix name="DownloadData" label="Download data request"/>
+  <suffix name="Other" label="Other requests"/>
   <affected-histogram name="CloudPrint.UrlFetcherDownloadSize"/>
   <affected-histogram name="CloudPrint.UrlFetcherRequestTime"/>
   <affected-histogram name="CloudPrint.UrlFetcherRetries"/>
   <affected-histogram name="CloudPrint.UrlFetcherUploadSize"/>
-</fieldtrial>
-
-<fieldtrial name="ConnCountImpact">
-  <group name="conn_count_16" label="with 16 persistent connections per host"/>
-  <group name="conn_count_4" label="with 4 persistent connections per host"/>
-  <group name="conn_count_5" label="with 5 persistent connections per host"/>
-  <group name="conn_count_6" label="with 6 persistent connections per host"/>
-  <group name="conn_count_7" label="with 7 persistent connections per host"/>
-  <group name="conn_count_8" label="with 8 persistent connections per host"/>
-  <group name="conn_count_9" label="with 9 persistent connections per host"/>
+</histogram_suffixes>
+
+<histogram_suffixes name="ConnCountImpact">
+  <suffix name="conn_count_16" label="with 16 persistent connections per host"/>
+  <suffix name="conn_count_4" label="with 4 persistent connections per host"/>
+  <suffix name="conn_count_5" label="with 5 persistent connections per host"/>
+  <suffix name="conn_count_6" label="with 6 persistent connections per host"/>
+  <suffix name="conn_count_7" label="with 7 persistent connections per host"/>
+  <suffix name="conn_count_8" label="with 8 persistent connections per host"/>
+  <suffix name="conn_count_9" label="with 9 persistent connections per host"/>
   <affected-histogram name="Net.Transaction_Connected_New"/>
   <affected-histogram name="PLT.Abandoned"/>
   <affected-histogram name="PLT.BeginToFinish_LinkLoadNormal"/>
@@ -41172,28 +46216,28 @@ other types of suffix sets.
   <affected-histogram name="Renderer4.BeginToFinish_LinkLoadReload"/>
   <affected-histogram name="Renderer4.BeginToFinish_LinkLoadStaleOk"/>
   <affected-histogram name="Renderer4.BeginToFinish_NormalLoad"/>
-</fieldtrial>
-
-<fieldtrial name="ConnectivityDiagnostics" separator=".">
-  <group name="0" label="INTERNET_DISCONNECTED"/>
-  <group name="1" label="CHROME_VERSION"/>
-  <group name="2" label="CHROMEOS_VERSION"/>
-  <group name="3" label="DNS_RESOLVER_PRESENT"/>
-  <group name="4" label="CAPTIVE_PORTAL_DNS"/>
-  <group name="5" label="CAPTIVE_PORTAL_HTTP"/>
-  <group name="6" label="FIREWALL_80"/>
-  <group name="7" label="FIREWALL_443"/>
-  <group name="8" label="RESOLVER_LATENCY"/>
-  <group name="9" label="HTTP_LATENCY"/>
-  <group name="10" label="NIC_SIGNAL_STRENGTH"/>
-  <group name="11" label="PING_GATEWAY"/>
+</histogram_suffixes>
+
+<histogram_suffixes name="ConnectivityDiagnostics" separator=".">
+  <suffix name="0" label="INTERNET_DISCONNECTED"/>
+  <suffix name="1" label="CHROME_VERSION"/>
+  <suffix name="2" label="CHROMEOS_VERSION"/>
+  <suffix name="3" label="DNS_RESOLVER_PRESENT"/>
+  <suffix name="4" label="CAPTIVE_PORTAL_DNS"/>
+  <suffix name="5" label="CAPTIVE_PORTAL_HTTP"/>
+  <suffix name="6" label="FIREWALL_80"/>
+  <suffix name="7" label="FIREWALL_443"/>
+  <suffix name="8" label="RESOLVER_LATENCY"/>
+  <suffix name="9" label="HTTP_LATENCY"/>
+  <suffix name="10" label="NIC_SIGNAL_STRENGTH"/>
+  <suffix name="11" label="PING_GATEWAY"/>
   <affected-histogram name="ConnectivityDiagnostics.TestVerdict"/>
   <affected-histogram name="ConnectivityDiagnostics.TimeTaken"/>
-</fieldtrial>
+</histogram_suffixes>
 
-<fieldtrial name="ConnnectBackupJobs">
-  <group name="ConnectBackupJobsEnabled"/>
-  <group name="ConnectBackupJobsDisabled"/>
+<histogram_suffixes name="ConnnectBackupJobs">
+  <suffix name="ConnectBackupJobsEnabled"/>
+  <suffix name="ConnectBackupJobsDisabled"/>
   <affected-histogram name="Net.PreconnectUtilization"/>
   <affected-histogram name="Net.PreconnectUtilization2"/>
   <affected-histogram name="PLT.Abandoned"/>
@@ -41201,29 +46245,29 @@ other types of suffix sets.
   <affected-histogram name="PLT.BeginToFinish_LinkLoadReload"/>
   <affected-histogram name="PLT.BeginToFinish_NormalLoad"/>
   <affected-histogram name="PLT.LoadType"/>
-</fieldtrial>
+</histogram_suffixes>
 
-<fieldtrial name="ContextualSearch">
-  <group name="Control"/>
-  <group name="Tap"/>
-  <group name="TapForced"/>
+<histogram_suffixes name="ContextualSearch">
+  <suffix name="Control"/>
+  <suffix name="Tap"/>
+  <suffix name="TapForced"/>
   <affected-histogram name="Search.ContextualSearchOptCard"/>
   <affected-histogram name="Search.ContextualSearchOptPeekCard"/>
   <affected-histogram name="Search.ContextualSearchPeekCard"/>
   <affected-histogram name="Search.ContextualSearchTap"/>
   <affected-histogram name="Search.ContextualSearchTapUndecided"/>
   <affected-histogram name="Search.ContextualSearchTimeToSearch"/>
-</fieldtrial>
+</histogram_suffixes>
 
-<fieldtrial name="CrosFirstRunStep" separator="">
-  <group name="AppList"/>
-  <group name="Tray"/>
-  <group name="Help"/>
+<histogram_suffixes name="CrosFirstRunStep" separator="">
+  <suffix name="AppList"/>
+  <suffix name="Tray"/>
+  <suffix name="Help"/>
   <affected-histogram name="CrosFirstRun.TimeSpentOnStep"/>
-</fieldtrial>
+</histogram_suffixes>
 
-<fieldtrial name="DataReductionProxy">
-  <group name="DataReductionProxy"
+<histogram_suffixes name="DataReductionProxy">
+  <suffix name="DataReductionProxy"
       label="Only page loads through the data reduction proxy are considered."/>
   <affected-histogram name="PLT.NT_Connect"/>
   <affected-histogram name="PLT.NT_DelayBeforeConnect"/>
@@ -41254,11 +46298,11 @@ other types of suffix sets.
   <affected-histogram name="PLT.PT_RequestToStart"/>
   <affected-histogram name="PLT.PT_StartToCommit"/>
   <affected-histogram name="PLT.PT_StartToFinish"/>
-</fieldtrial>
+</histogram_suffixes>
 
-<fieldtrial name="DefaultAppsExperiment">
-  <group name="NoDefaultApps" label="User's without default apps installed"/>
-  <group name="WithDefaultApps" label="User's with default apps installed"/>
+<histogram_suffixes name="DefaultAppsExperiment">
+  <suffix name="NoDefaultApps" label="User's without default apps installed"/>
+  <suffix name="WithDefaultApps" label="User's with default apps installed"/>
   <affected-histogram name="Extensions.AppTabLaunchType"/>
   <affected-histogram name="Extensions.ExtensionInstalled"/>
   <affected-histogram name="Extensions.ExtensionUninstalled"/>
@@ -41267,26 +46311,26 @@ other types of suffix sets.
   <affected-histogram name="NtpHandler.AttachShownPageType"/>
   <affected-histogram name="NtpHandler.SelectedShownPageType"/>
   <affected-histogram name="Profile.AppCount"/>
-</fieldtrial>
+</histogram_suffixes>
 
-<fieldtrial name="DefaultPinnedApps">
+<histogram_suffixes name="DefaultPinnedApps">
   <obsolete>
     Deprecated as of 12/2013. Default pinned apps trial is finished.
   </obsolete>
-  <group name="Existing"/>
-  <group name="Control"/>
-  <group name="Alternate"/>
+  <suffix name="Existing"/>
+  <suffix name="Control"/>
+  <suffix name="Alternate"/>
   <affected-histogram name="Cros.ClickOnShelf"/>
-</fieldtrial>
-
-<fieldtrial name="DiskUsagePerUserCount" separator=".">
-  <group name="1User" label="Only 1 user exists on device."/>
-  <group name="2Users" label="2 users exist on device."/>
-  <group name="3Users" label="3 users exist on device."/>
-  <group name="4Users" label="4 users exist on device."/>
-  <group name="5Users" label="5 users exist on device."/>
-  <group name="6Users" label="6 users exist on device."/>
-  <group name="7OrMoreUsers" label="7 or more users exist on device."/>
+</histogram_suffixes>
+
+<histogram_suffixes name="DiskUsagePerUserCount" separator=".">
+  <suffix name="1User" label="Only 1 user exists on device."/>
+  <suffix name="2Users" label="2 users exist on device."/>
+  <suffix name="3Users" label="3 users exist on device."/>
+  <suffix name="4Users" label="4 users exist on device."/>
+  <suffix name="5Users" label="5 users exist on device."/>
+  <suffix name="6Users" label="6 users exist on device."/>
+  <suffix name="7OrMoreUsers" label="7 or more users exist on device."/>
   <affected-histogram name="Platform.DiskUsage.Cache_Avg"/>
   <affected-histogram name="Platform.DiskUsage.Cache_Max"/>
   <affected-histogram name="Platform.DiskUsage.Downloads_Avg"/>
@@ -41294,24 +46338,24 @@ other types of suffix sets.
   <affected-histogram name="Platform.DiskUsage.GCache_Avg"/>
   <affected-histogram name="Platform.DiskUsage.GCache_Max"/>
   <affected-histogram name="Platform.DiskUsage.LeastUsedAccountDays"/>
-</fieldtrial>
+</histogram_suffixes>
 
-<fieldtrial name="DnsImpact2">
-  <group name="disabled_prefetch"
+<histogram_suffixes name="DnsImpact2">
+  <suffix name="disabled_prefetch"
       label="DNS pre-resolving is disabled in these clients"/>
-  <group name="disabled_prefetch_4_connections"
+  <suffix name="disabled_prefetch_4_connections"
       label="DNS pre-resolving is disabled in these clients, and a maximum of
              4 connections per host was allowed"/>
-  <group name="enabled_prefetch_4_connections"
+  <suffix name="enabled_prefetch_4_connections"
       label="a maximum of 4 connections per host was allowed in these clients"/>
-  <group name="parallel_4_prefetch"
+  <suffix name="parallel_4_prefetch"
       label="DNS pre-resolving was only doing 4 concurrent speculative
              resolutions in this test"/>
   <affected-histogram name="Net.Dns_Resolution_And_TCP_Connection_Latency"/>
   <affected-histogram name="Net.TCP_Connection_Idle_Sockets">
-    <with-group name="disabled_prefetch"/>
-    <with-group name="disabled_prefetch_4_connections"/>
-    <with-group name="enabled_prefetch_4_connections"/>
+    <with-suffix name="disabled_prefetch"/>
+    <with-suffix name="disabled_prefetch_4_connections"/>
+    <with-suffix name="enabled_prefetch_4_connections"/>
   </affected-histogram>
   <affected-histogram name="Net.TCP_Connection_Latency"/>
   <affected-histogram name="Net.Transaction_Connected"/>
@@ -41327,21 +46371,21 @@ other types of suffix sets.
   <affected-histogram name="Net.Transaction_Latency_Total_Under_10"/>
   <affected-histogram name="Net.Transaction_Latency_Under_10"/>
   <affected-histogram name="PLT.RequestToFinish">
-    <with-group name="parallel_4_prefetch"/>
+    <with-suffix name="parallel_4_prefetch"/>
   </affected-histogram>
-</fieldtrial>
+</histogram_suffixes>
 
-<fieldtrial name="DnsImpact3">
-  <group name="disabled_prefetch" label="with DNS pre-resolving disabled"/>
-  <group name="parallel_4_prefetch"
+<histogram_suffixes name="DnsImpact3">
+  <suffix name="disabled_prefetch" label="with DNS pre-resolving disabled"/>
+  <suffix name="parallel_4_prefetch"
       label="with only 4 concurrent speculative resolutions done in parallel"/>
   <affected-histogram name="Net.Transaction_Connected_New">
-    <with-group name="disabled_prefetch"/>
+    <with-suffix name="disabled_prefetch"/>
   </affected-histogram>
   <affected-histogram name="Renderer2.FinishDocToFinish"/>
   <affected-histogram name="Renderer2.RequestToFinish"/>
   <affected-histogram name="Renderer2.RequestToFinish_L">
-    <with-group name="disabled_prefetch"/>
+    <with-suffix name="disabled_prefetch"/>
   </affected-histogram>
   <affected-histogram name="Renderer2.RequestToFirstLayout"/>
   <affected-histogram name="Renderer2.RequestToStart"/>
@@ -41349,76 +46393,76 @@ other types of suffix sets.
   <affected-histogram name="Renderer2.StartToFinishDoc"/>
   <affected-histogram name="Renderer2.StartToFirstLayout"/>
   <affected-histogram name="Renderer4.RequestToFinish">
-    <with-group name="parallel_4_prefetch"/>
+    <with-suffix name="parallel_4_prefetch"/>
   </affected-histogram>
   <affected-histogram name="Renderer4.StartToFinish">
-    <with-group name="parallel_4_prefetch"/>
+    <with-suffix name="parallel_4_prefetch"/>
   </affected-histogram>
-</fieldtrial>
+</histogram_suffixes>
 
-<fieldtrial name="DnsParallelism">
-  <group name="parallel_10"
+<histogram_suffixes name="DnsParallelism">
+  <suffix name="parallel_10"
       label="with only 10 concurrent resolutions done in parallel"/>
-  <group name="parallel_14"
+  <suffix name="parallel_14"
       label="with only 14 concurrent resolutions done in parallel"/>
-  <group name="parallel_20"
+  <suffix name="parallel_20"
       label="with only 20 concurrent resolutions done in parallel"/>
-  <group name="parallel_6"
+  <suffix name="parallel_6"
       label="with only 6 concurrent resolutions done in parallel"/>
-  <group name="parallel_7"
+  <suffix name="parallel_7"
       label="with only 7 concurrent resolutions done in parallel"/>
-  <group name="parallel_8"
+  <suffix name="parallel_8"
       label="with only 8 concurrent resolutions done in parallel"/>
-  <group name="parallel_9"
+  <suffix name="parallel_9"
       label="with only 9 concurrent resolutions done in parallel"/>
-  <group name="parallel_default"
+  <suffix name="parallel_default"
       label="with the default number of concurrent resolutions done in
              parallel"/>
   <affected-histogram name="DNS.ResolveCategory"/>
   <affected-histogram name="DNS.ResolveSuccess"/>
-</fieldtrial>
+</histogram_suffixes>
 
-<fieldtrial name="DocsSpecific" separator="">
-  <group name="Docs" label="Only for docs.google.com"/>
+<histogram_suffixes name="DocsSpecific" separator="">
+  <suffix name="Docs" label="Only for docs.google.com"/>
   <affected-histogram name="appcache.MainResourceResponseRetrieval"/>
   <affected-histogram name="appcache.SubResourceResponseRetrieval"/>
   <affected-histogram name="appcache.UpdateJobResult"/>
   <affected-histogram name="appcache.UpdateProgressAtPointOfFaliure"/>
   <affected-histogram name="appcache.UpdateWasOffOriginAtPointOfFailure"/>
   <affected-histogram name="appcache.UpdateWasStalledAtPointOfFailure"/>
-</fieldtrial>
+</histogram_suffixes>
 
-<fieldtrial name="DomainGoogle" separator="">
-  <group name="Google" label="only Google cookies are recorded."/>
-  <group name="Other" label="only NON-Google cookies are recorded."/>
+<histogram_suffixes name="DomainGoogle" separator="">
+  <suffix name="Google" label="only Google cookies are recorded."/>
+  <suffix name="Other" label="only NON-Google cookies are recorded."/>
   <affected-histogram name="Cookie.ReinstatedCookies"/>
-</fieldtrial>
+</histogram_suffixes>
 
-<fieldtrial name="ExternalExtensionEvent" separator="">
-  <group name="NonWebstore"
+<histogram_suffixes name="ExternalExtensionEvent" separator="">
+  <suffix name="NonWebstore"
       label="sideloaded extensions that don't update from the webstore"/>
-  <group name="Webstore"
+  <suffix name="Webstore"
       label="sideloaded extensions that update from the webstore"/>
   <affected-histogram name="Extensions.ExternalExtensionEvent"/>
-</fieldtrial>
+</histogram_suffixes>
 
-<fieldtrial name="FileBrowserLoad" separator=".">
-  <group name="Construct"
+<histogram_suffixes name="FileBrowserLoad" separator=".">
+  <suffix name="Construct"
       label="Time spent constructing the main Javascript object."/>
-  <group name="DOM" label="Time to initialize DOM."/>
-  <group name="FileSystem"
+  <suffix name="DOM" label="Time to initialize DOM."/>
+  <suffix name="FileSystem"
       label="Deprecated as of 9/2013. Time to get access to the local file
              system."/>
-  <group name="Parse" label="Time to parse Javascript and CSS."/>
-  <group name="Roots" label="Time to enumerate file system roots."/>
-  <group name="Total"
+  <suffix name="Parse" label="Time to parse Javascript and CSS."/>
+  <suffix name="Roots" label="Time to enumerate file system roots."/>
+  <suffix name="Total"
       label="Total load time from the moment the Javascript started parsing
              till the moment the empty file list is displayed."/>
   <affected-histogram name="FileBrowser.Load"/>
-</fieldtrial>
+</histogram_suffixes>
 
-<fieldtrial name="FromGWS">
-  <group name="FromGWS"
+<histogram_suffixes name="FromGWS">
+  <suffix name="FromGWS"
       label="Only page loads that are a result of a navigation from a web
              search are considered."/>
   <affected-histogram name="PLT.BeginToFinish"/>
@@ -41437,86 +46481,101 @@ other types of suffix sets.
   <affected-histogram name="PLT.PT_RequestToStart"/>
   <affected-histogram name="PLT.PT_StartToCommit"/>
   <affected-histogram name="PLT.PT_StartToFinish"/>
-</fieldtrial>
-
-<fieldtrial name="GWSChromeJointExperiment">
-  <group name="Experiment1"
+</histogram_suffixes>
+
+<histogram_suffixes name="GoogleSearchVariations">
+  <owner>kmadhusu@chromium.org</owner>
+  <suffix name="_PrerenderDisabled"
+      label="Counts number of Google searches from various access points in
+             the Android Chrome browser when prerendering is disabled via
+             &quot;Bandwidth management&quot; settings or &quot;Privacy&quot;
+             settings. Only recorded on Android."/>
+  <suffix name="_PrerenderEnabled"
+      label="Counts number of Google searches from various access points in
+             the Android Chrome browser when prerendering is enabled via
+             &quot;Bandwidth management&quot; settings or &quot;Privacy&quot;
+             settings. Only recorded on Android."/>
+  <affected-histogram name="GoogleSearch.AccessPoint"/>
+</histogram_suffixes>
+
+<histogram_suffixes name="GWSChromeJointExperiment">
+  <suffix name="Experiment1"
       label="Only page loads that are a result of a navigation from a web
              search under a specific web search/Chrome joint experiment.
              Unused at this moment."/>
-  <group name="Experiment2"
+  <suffix name="Experiment2"
       label="Only page loads that are a result of a navigation from a web
              search under a specific web search/Chrome joint experiment.
              Unused at this moment."/>
-  <group name="Experiment3"
+  <suffix name="Experiment3"
       label="Only page loads that are a result of a navigation from a web
              search under a specific web search/Chrome joint experiment.
              Unused at this moment."/>
-  <group name="Experiment4"
+  <suffix name="Experiment4"
       label="Only page loads that are a result of a navigation from a web
              search under a specific web search/Chrome joint experiment.
              Unused at this moment."/>
-  <group name="Experiment5"
+  <suffix name="Experiment5"
       label="Only page loads that are a result of a navigation from a web
              search under a specific web search/Chrome joint experiment.
              Unused at this moment."/>
-  <group name="Experiment6"
+  <suffix name="Experiment6"
       label="Only page loads that are a result of a navigation from a web
              search under a specific web search/Chrome joint experiment.
              Unused at this moment."/>
-  <group name="Experiment7"
+  <suffix name="Experiment7"
       label="Only page loads that are a result of a navigation from a web
              search under a specific web search/Chrome joint experiment.
              Unused at this moment."/>
-  <group name="Experiment8"
+  <suffix name="Experiment8"
       label="Only page loads that are a result of a navigation from a web
              search under a specific web search/Chrome joint experiment.
              Unused at this moment."/>
-  <group name="Experiment9"
+  <suffix name="Experiment9"
       label="Only page loads that are a result of a navigation from a web
              search under a specific web search/Chrome joint experiment.
              Unused at this moment."/>
-  <group name="Experiment10"
+  <suffix name="Experiment10"
       label="Only page loads that are a result of a navigation from a web
              search under a specific web search/Chrome joint experiment.
              Unused at this moment."/>
-  <group name="Experiment11"
+  <suffix name="Experiment11"
       label="Only page loads that are a result of a navigation from a web
              search under a specific web search/Chrome joint experiment.
              Unused at this moment."/>
-  <group name="Experiment12"
+  <suffix name="Experiment12"
       label="Only page loads that are a result of a navigation from a web
              search under a specific web search/Chrome joint experiment.
              Unused at this moment."/>
-  <group name="Experiment13"
+  <suffix name="Experiment13"
       label="Only page loads that are a result of a navigation from a web
              search under a specific web search/Chrome joint experiment.
              Unused at this moment."/>
-  <group name="Experiment14"
+  <suffix name="Experiment14"
       label="Only page loads that are a result of a navigation from a web
              search under a specific web search/Chrome joint experiment.
              Unused at this moment."/>
-  <group name="Experiment15"
+  <suffix name="Experiment15"
       label="Only page loads that are a result of a navigation from a web
              search under a specific web search/Chrome joint experiment.
              Unused at this moment."/>
-  <group name="Experiment16"
+  <suffix name="Experiment16"
       label="Only page loads that are a result of a navigation from a web
              search under a specific web search/Chrome joint experiment.
              Unused at this moment."/>
-  <group name="Experiment17"
+  <suffix name="Experiment17"
       label="Only page loads that are a result of a navigation from a web
              search under a specific web search/Chrome joint experiment.
              Unused at this moment."/>
-  <group name="Experiment18"
+  <suffix name="Experiment18"
       label="Only page loads that are a result of a navigation from a web
              search under a specific web search/Chrome joint experiment.
              Unused at this moment."/>
-  <group name="Experiment19"
+  <suffix name="Experiment19"
       label="Only page loads that are a result of a navigation from a web
              search under a specific web search/Chrome joint experiment.
              Unused at this moment."/>
-  <group name="Experiment20"
+  <suffix name="Experiment20"
       label="Only page loads that are a result of a navigation from a web
              search under a specific web search/Chrome joint experiment.
              Unused at this moment."/>
@@ -41584,11 +46643,11 @@ other types of suffix sets.
   <affected-histogram name="PLT.PT_StartToFinish_NoPreview"/>
   <affected-histogram name="PLT.PT_StartToFinish_Preview"/>
   <affected-histogram name="PLT.PT_StartToFinish_WithPreview"/>
-</fieldtrial>
+</histogram_suffixes>
 
-<fieldtrial name="HttpPipeliningCompatibility">
-  <group name="disable_test" label="Do nothing"/>
-  <group name="enable_test" label="Test connection for HTTP pipelining"/>
+<histogram_suffixes name="HttpPipeliningCompatibility">
+  <suffix name="disable_test" label="Do nothing"/>
+  <suffix name="enable_test" label="Test connection for HTTP pipelining"/>
   <affected-histogram name="NetConnectivity.Pipeline.0.NetworkError"/>
   <affected-histogram name="NetConnectivity.Pipeline.0.ResponseCode"/>
   <affected-histogram name="NetConnectivity.Pipeline.0.Status"/>
@@ -41611,76 +46670,77 @@ other types of suffix sets.
   <affected-histogram name="NetConnectivity.Pipeline.CanarySuccess"/>
   <affected-histogram name="NetConnectivity.Pipeline.Depth"/>
   <affected-histogram name="NetConnectivity.Pipeline.Success"/>
-</fieldtrial>
-
-<fieldtrial name="IndexedDBLevelDBErrnoMethods" separator=".">
-  <group name="NewLogger" label="ChromiumEnv::NewLogger"/>
-  <group name="NewSequentialFile" label="ChromiumEnv::NewSequentialFile"/>
-  <group name="NewWritableFile" label="ChromiumEnv::NewWritableFile"/>
-  <group name="SequentialFileRead" label="ChromiumSequentialFile::Read"/>
-  <group name="SequentialFileSkip" label="ChromiumSequentialFile::Skip"/>
-  <group name="WritableFileAppend" label="ChromiumWritableFile::Append"/>
-  <group name="WritableFileClose" label="ChromiumWritableFile::Close"/>
-  <group name="WritableFileFlush" label="ChromiumWritableFile::Flush"/>
-  <group name="WritableFileSync" label="ChromiumWritableFile::Sync"/>
-  <group name="WritableFileSyncParent"
+</histogram_suffixes>
+
+<histogram_suffixes name="IndexedDBLevelDBErrnoMethods" separator=".">
+  <suffix name="NewLogger" label="ChromiumEnv::NewLogger"/>
+  <suffix name="NewSequentialFile" label="ChromiumEnv::NewSequentialFile"/>
+  <suffix name="NewWritableFile" label="ChromiumEnv::NewWritableFile"/>
+  <suffix name="SequentialFileRead" label="ChromiumSequentialFile::Read"/>
+  <suffix name="SequentialFileSkip" label="ChromiumSequentialFile::Skip"/>
+  <suffix name="WritableFileAppend" label="ChromiumWritableFile::Append"/>
+  <suffix name="WritableFileClose" label="ChromiumWritableFile::Close"/>
+  <suffix name="WritableFileFlush" label="ChromiumWritableFile::Flush"/>
+  <suffix name="WritableFileSync" label="ChromiumWritableFile::Sync"/>
+  <suffix name="WritableFileSyncParent"
       label="ChromiumWritableFile::SyncParent"/>
   <affected-histogram name="WebCore.IndexedDB.LevelDBOpenErrors.Errno"/>
   <affected-histogram name="WebCore.IndexedDB.LevelDBReadErrors.Errno"/>
   <affected-histogram name="WebCore.IndexedDB.LevelDBWriteErrors.Errno"/>
-</fieldtrial>
-
-<fieldtrial name="IndexedDBLevelDBPFEMethods" separator=".">
-  <group name="CreateDir" label="ChromiumEnv::CreateDir"/>
-  <group name="DeleteDir" label="ChromiumEnv::DeleteDir"/>
-  <group name="DeleteFile" label="ChromiumEnv::DeleteFile"/>
-  <group name="GetChildren" label="ChromiumEnv::GetChildren"/>
-  <group name="GetFileSize" label="ChromiumEnv::GetFileSize"/>
-  <group name="LockFile" label="ChromiumEnv::LockFile"/>
-  <group name="NewRandomAccessFile" label="ChromiumEnv::NewRandomAccessFile"/>
-  <group name="RandomAccessFileRead" label="ChromiumRandomAccessFile::Read"/>
-  <group name="RenameFile" label="ChromiumEnv::RenameFile"/>
-  <group name="UnlockFile" label="ChromiumEnv::UnlockFile"/>
+</histogram_suffixes>
+
+<histogram_suffixes name="IndexedDBLevelDBPFEMethods" separator=".">
+  <suffix name="CreateDir" label="ChromiumEnv::CreateDir"/>
+  <suffix name="DeleteDir" label="ChromiumEnv::DeleteDir"/>
+  <suffix name="DeleteFile" label="ChromiumEnv::DeleteFile"/>
+  <suffix name="GetChildren" label="ChromiumEnv::GetChildren"/>
+  <suffix name="GetFileSize" label="ChromiumEnv::GetFileSize"/>
+  <suffix name="LockFile" label="ChromiumEnv::LockFile"/>
+  <suffix name="NewRandomAccessFile" label="ChromiumEnv::NewRandomAccessFile"/>
+  <suffix name="RandomAccessFileRead" label="ChromiumRandomAccessFile::Read"/>
+  <suffix name="RenameFile" label="ChromiumEnv::RenameFile"/>
+  <suffix name="UnlockFile" label="ChromiumEnv::UnlockFile"/>
   <affected-histogram name="WebCore.IndexedDB.LevelDBOpenErrors.PFE"/>
   <affected-histogram name="WebCore.IndexedDB.LevelDBReadErrors.PFE"/>
   <affected-histogram name="WebCore.IndexedDB.LevelDBWriteErrors.PFE"/>
-</fieldtrial>
+</histogram_suffixes>
 
-<fieldtrial name="InstallerDownloadSources" separator="">
-  <group name="HttpPeer" label="Download Source: HTTP Peer"/>
-  <group name="HttpServer" label="Download Source: HTTP Server"/>
-  <group name="HttpsServer" label="Download Source: HTTPS Server"/>
+<histogram_suffixes name="InstallerDownloadSources" separator="">
+  <suffix name="HttpPeer" label="Download Source: HTTP Peer"/>
+  <suffix name="HttpServer" label="Download Source: HTTP Server"/>
+  <suffix name="HttpsServer" label="Download Source: HTTPS Server"/>
   <affected-histogram name="Installer.SuccessfulMBsDownloadedFrom"/>
   <affected-histogram name="Installer.TotalMBsDownloadedFrom"/>
-</fieldtrial>
+</histogram_suffixes>
 
-<fieldtrial name="Instant">
-  <group name="Extended" label="Suggestions + Results"/>
-  <group name="Instant" label="Results"/>
+<histogram_suffixes name="Instant">
+  <suffix name="Extended" label="Suggestions + Results"/>
+  <suffix name="Instant" label="Results"/>
   <affected-histogram name="Instant.SessionsStorageNamespace"/>
-</fieldtrial>
-
-<fieldtrial name="InstantExtended_QuerytoQuery">
-  <group name="400" label="Omnibox width &lt; 400"/>
-  <group name="700" label="Omnibox width &lt; 700"/>
-  <group name="1200" label="Omnibox width &lt; 1200"/>
-  <group name="large" label="Omnibox width &gt;= 1200"/>
+</histogram_suffixes>
+
+<histogram_suffixes name="InstantExtended_QuerytoQuery">
+  <owner>macourteau@chromium.org</owner>
+  <suffix name="400" label="Omnibox width &lt; 400"/>
+  <suffix name="700" label="Omnibox width &lt; 700"/>
+  <suffix name="1200" label="Omnibox width &lt; 1200"/>
+  <suffix name="large" label="Omnibox width &gt;= 1200"/>
   <affected-histogram name="InstantExtended.PercentageMatchV2_QuerytoQuery"/>
   <affected-histogram name="InstantExtended.PercentageMatchV2_QuerytoURL"/>
   <affected-histogram name="InstantExtended.PercentageMatchV2_URLtoQuery"/>
   <affected-histogram name="InstantExtended.PercentageMatchV2_URLtoURL"/>
-</fieldtrial>
+</histogram_suffixes>
 
-<fieldtrial name="InstantSearchClicks">
-  <group name="WithPreview"
+<histogram_suffixes name="InstantSearchClicks">
+  <suffix name="WithPreview"
       label="Only page loads through data reduction proxy that are result of
              navigation from web search and preview version of the page shown
              are considered."/>
-  <group name="Preview"
+  <suffix name="Preview"
       label="Only page loads through data reduction proxy that are result of
              navigation from web search and preview version of the page shown
              are considered."/>
-  <group name="NoPreview"
+  <suffix name="NoPreview"
       label="Only page loads through data reduction proxy that are result of
              navigation from web search and preview version of the page shown
              are considered."/>
@@ -41702,41 +46762,41 @@ other types of suffix sets.
   <affected-histogram name="PLT.PT_RequestToStart"/>
   <affected-histogram name="PLT.PT_StartToCommit"/>
   <affected-histogram name="PLT.PT_StartToFinish"/>
-</fieldtrial>
+</histogram_suffixes>
 
-<fieldtrial name="Interval" separator="_">
-  <group name="Interval" label="Interval between two consecutive connects is"/>
+<histogram_suffixes name="Interval" separator="_">
+  <suffix name="Interval" label="Interval between two consecutive connects is"/>
   <affected-histogram name="Net.TCP_Connection_Latency"/>
-</fieldtrial>
+</histogram_suffixes>
 
-<fieldtrial name="Interval_20ms_plus_and_minus" separator="_">
-  <group name="Interval_20ms_Minus"
+<histogram_suffixes name="Interval_20ms_plus_and_minus" separator="_">
+  <suffix name="Interval_20ms_Minus"
       label="Interval between two consecutive connects is less than 20ms."/>
-  <group name="Interval_20ms_Plus"
+  <suffix name="Interval_20ms_Plus"
       label="Interval between two consecutive connects is greater than or
              equal to 20ms."/>
   <affected-histogram name="Net.TCP_Connection_Latency"/>
-</fieldtrial>
+</histogram_suffixes>
 
-<fieldtrial name="Interval_lt_gt_20ms" separator="_">
-  <group name="LessThanOrEqual_10ms" label="less than or equal to 10ms."/>
-  <group name="LessThanOrEqual_20ms"
+<histogram_suffixes name="Interval_lt_gt_20ms" separator="_">
+  <suffix name="LessThanOrEqual_10ms" label="less than or equal to 10ms."/>
+  <suffix name="LessThanOrEqual_20ms"
       label="more than 10ms, and less than or equal to 20ms."/>
-  <group name="GreaterThan_20ms" label="greater than 20ms."/>
+  <suffix name="GreaterThan_20ms" label="greater than 20ms."/>
   <affected-histogram name="Net.TCP_Connection_Latency_Interval"/>
-</fieldtrial>
+</histogram_suffixes>
 
-<fieldtrial name="IPv6_Probe">
-  <group name="IPv6_probe_skipped"
+<histogram_suffixes name="IPv6_Probe">
+  <suffix name="IPv6_probe_skipped"
       label="with IPv6 not probed, and default OS settings used"/>
-  <group name="IPv6_probe_done"
+  <suffix name="IPv6_probe_done"
       label="with IPv6 probed for and possibly disabled"/>
   <affected-histogram name="DNS.PrefetchResolution"/>
-</fieldtrial>
+</histogram_suffixes>
 
-<fieldtrial name="LateBindingExperiment">
-  <group name="disable_late_binding" label="socket late binding is disabled"/>
-  <group name="enable_late_binding" label="socket late binding is enabled"/>
+<histogram_suffixes name="LateBindingExperiment">
+  <suffix name="disable_late_binding" label="socket late binding is disabled"/>
+  <suffix name="enable_late_binding" label="socket late binding is enabled"/>
   <affected-histogram name="Net.SocketIdleTimeBeforeNextUse_ReusedSocket"/>
   <affected-histogram name="Net.SocketIdleTimeBeforeNextUse_UnusedSocket"/>
   <affected-histogram name="Net.SocketIdleTimeOnIOError2_ReusedSocket"/>
@@ -41755,149 +46815,157 @@ other types of suffix sets.
   <affected-histogram name="Renderer4.BeginToFinishDoc_NormalLoad"/>
   <affected-histogram name="Renderer4.RequestToFinish"/>
   <affected-histogram name="Renderer4.StartToFinish"/>
-</fieldtrial>
+</histogram_suffixes>
 
-<fieldtrial name="LevelDBEnvBackupRestore" separator="">
-  <group name="Backup" label="Backing up an ldb file."/>
-  <group name="Restore" label="Restoring an ldb file."/>
+<histogram_suffixes name="LevelDBEnvBackupRestore" separator="">
+  <suffix name="Backup" label="Backing up an ldb file."/>
+  <suffix name="Restore" label="Restoring an ldb file."/>
   <affected-histogram name="LevelDBEnv.IDB.Table"/>
   <affected-histogram name="LevelDBEnv.Table"/>
-</fieldtrial>
+</histogram_suffixes>
 
-<fieldtrial name="LevelDBEnvMaxFDs" separator=".">
-  <group name="Success"
+<histogram_suffixes name="LevelDBEnvMaxFDs" separator=".">
+  <suffix name="Success"
       label="This histogram shows the limit when open succeeded."/>
-  <group name="TooManyOpened"
+  <suffix name="TooManyOpened"
       label="This histogram shows the limit when open failed because the
              limit had been reached."/>
-  <group name="OtherError"
+  <suffix name="OtherError"
       label="This histogram shows the limit when open failed for reasons
              other than exceeding the limit."/>
   <affected-histogram name="LevelDBEnv.IDB.MaxFDs"/>
   <affected-histogram name="LevelDBEnv.MaxFDs"/>
-</fieldtrial>
-
-<fieldtrial name="LevelDBEnvPlatformFileErrors" separator="">
-  <group name="CreateDir" label="ChromiumEnv::CreateDir"/>
-  <group name="GetChildren" label="ChromiumEnv::GetChildren"/>
-  <group name="LockFile" label="ChromiumEnv::LockFile"/>
-  <group name="NewRandomAccessFile" label="ChromiumEnv::NewRandomAccessFile"/>
-  <group name="RenameFile" label="ChromiumEnv::RenameFile"/>
+</histogram_suffixes>
+
+<histogram_suffixes name="LevelDBEnvPlatformFileErrors" separator="">
+  <suffix name="CreateDir" label="ChromiumEnv::CreateDir"/>
+  <suffix name="GetChildren" label="ChromiumEnv::GetChildren"/>
+  <suffix name="LockFile" label="ChromiumEnv::LockFile"/>
+  <suffix name="NewRandomAccessFile" label="ChromiumEnv::NewRandomAccessFile"/>
+  <suffix name="RenameFile" label="ChromiumEnv::RenameFile"/>
   <affected-histogram name="LevelDBEnv.IDB.IOError."/>
   <affected-histogram name="LevelDBEnv.IOError."/>
-</fieldtrial>
+</histogram_suffixes>
 
-<fieldtrial name="LevelDBEnvRetry" separator="">
-  <group name="RenameFile" label="RenameFile"/>
-  <group name="LockFile" label="LockFile"/>
-  <group name="CreateDir" label="CreateDir"/>
+<histogram_suffixes name="LevelDBEnvRetry" separator="">
+  <suffix name="RenameFile" label="RenameFile"/>
+  <suffix name="LockFile" label="LockFile"/>
+  <suffix name="CreateDir" label="CreateDir"/>
   <affected-histogram name="LevelDBEnv.IDB.RetryRecoveredFromErrorIn"/>
   <affected-histogram name="LevelDBEnv.IDB.TimeUntilSuccessFor"/>
   <affected-histogram name="LevelDBEnv.RetryRecoveredFromErrorIn"/>
   <affected-histogram name="LevelDBEnv.TimeUntilSuccessFor"/>
-</fieldtrial>
+</histogram_suffixes>
 
-<fieldtrial name="LevelDBEnvRetryTimes" separator="">
+<histogram_suffixes name="LevelDBEnvRetryTimes" separator="">
   <obsolete>
     Deprecated 2013-04 in favor of LevelDBEnvRetry.
   </obsolete>
-  <group name="Rename" label="RenameFile"/>
-  <group name="LockFile" label="LockFile"/>
+  <suffix name="Rename" label="RenameFile"/>
+  <suffix name="LockFile" label="LockFile"/>
   <affected-histogram name="LevelDBEnv.IDB.TimeTo"/>
   <affected-histogram name="LevelDBEnv.TimeTo"/>
-</fieldtrial>
+</histogram_suffixes>
 
-<fieldtrial name="MediaAudioInputControllerTime" separator=".">
-  <group name="CloseTime" label="Measures the time taken for DoClose()."/>
-  <group name="CreateTime" label="Measures the time taken for DoCreate()."/>
-  <group name="RecordTime" label="Measures the time taken for DoRecord()."/>
+<histogram_suffixes name="MediaAudioInputControllerTime" separator=".">
+  <suffix name="CloseTime" label="Measures the time taken for DoClose()."/>
+  <suffix name="CreateTime" label="Measures the time taken for DoCreate()."/>
+  <suffix name="RecordTime" label="Measures the time taken for DoRecord()."/>
   <affected-histogram name="Media.AudioInputController"/>
-</fieldtrial>
+</histogram_suffixes>
 
-<fieldtrial name="MediaAudioInputDeviceManagerTime" separator=".">
-  <group name="OpenOnDeviceThreadTime"
+<histogram_suffixes name="MediaAudioInputDeviceManagerTime" separator=".">
+  <suffix name="OpenOnDeviceThreadTime"
       label="Measures the time taken for OpenOnDeviceThread()."/>
-  <group name="EnumerateOnDeviceThreadTime"
+  <suffix name="EnumerateOnDeviceThreadTime"
       label="Measures the time taken for EnumerateOnDeviceThread()."/>
   <affected-histogram name="Media.AudioInputDeviceManager"/>
-</fieldtrial>
+</histogram_suffixes>
 
-<fieldtrial name="MediaAudioOutputControllerTime" separator=".">
-  <group name="CloseTime" label="Measures the time taken for DoClose()."/>
-  <group name="CreateTime" label="Measures the time taken for DoCreate()."/>
-  <group name="DeviceChangeTime"
+<histogram_suffixes name="MediaAudioOutputControllerTime" separator=".">
+  <suffix name="CloseTime" label="Measures the time taken for DoClose()."/>
+  <suffix name="CreateTime" label="Measures the time taken for DoCreate()."/>
+  <suffix name="DeviceChangeTime"
       label="Measures the time taken for OnDeviceChange()."/>
-  <group name="PauseTime" label="Measures the time taken for DoPause()."/>
-  <group name="PlayTime"
+  <suffix name="PauseTime" label="Measures the time taken for DoPause()."/>
+  <suffix name="PlayTime"
       label="Measures the time taken for DoPlay(). Technically only the
              worker method AudioOutputController::PollAndStartIfDataReady()."/>
   <affected-histogram name="Media.AudioOutputController"/>
-</fieldtrial>
+</histogram_suffixes>
 
-<fieldtrial name="MediaVideoCaptureManagerTime" separator=".">
-  <group name="OnEnumerateDevicesTime"
+<histogram_suffixes name="MediaVideoCaptureManagerTime" separator=".">
+  <suffix name="OnEnumerateDevicesTime"
       label="Measures the time taken for OnEnumerateDevices()."/>
-  <group name="OnOpenTime" label="Measures the time taken for OnOpen()."/>
-  <group name="OnCloseTime" label="Measures the time taken for OnClose()."/>
-  <group name="OnStartTime" label="Measures the time taken for OnStart()."/>
-  <group name="OnStopTime" label="Measures the time taken for OnStop()."/>
+  <suffix name="OnOpenTime" label="Measures the time taken for OnOpen()."/>
+  <suffix name="OnCloseTime" label="Measures the time taken for OnClose()."/>
+  <suffix name="OnStartTime" label="Measures the time taken for OnStart()."/>
+  <suffix name="OnStopTime" label="Measures the time taken for OnStop()."/>
   <affected-histogram name="Media.VideoCaptureManager"/>
-</fieldtrial>
+</histogram_suffixes>
 
-<fieldtrial name="Net.QuicSession.21CumulativePackets" separator="_">
-  <group name="First21"
+<histogram_suffixes name="Net.QuicSession.21CumulativePackets" separator="_">
+  <owner>rch@chromium.org</owner>
+  <suffix name="First21"
       label="Only the first group of 21 packets in a connection via"/>
-  <group name="Some21s"
+  <suffix name="Some21s"
       label="After the first 21, this records data for some groups of 21
              consecutive sequence nmubers, arriving via."/>
   <affected-histogram name="Net.QuicSession.21CumulativePacketsReceived"/>
-</fieldtrial>
+</histogram_suffixes>
 
-<fieldtrial name="Net.QuicSession.6PacketPatterns" separator="_">
-  <group name="First6"
+<histogram_suffixes name="Net.QuicSession.6PacketPatterns" separator="_">
+  <owner>rch@chromium.org</owner>
+  <suffix name="First6"
       label="Only the first group of 6 packets in a connection via"/>
-  <group name="Some6s"
+  <suffix name="Some6s"
       label="After the first 6, this records patterns for some groups of 6
              consecutive sequence numbers, arriving via."/>
   <affected-histogram name="Net.QuicSession.6PacketsPatternsReceived"/>
-</fieldtrial>
+</histogram_suffixes>
 
-<fieldtrial name="Net.QuicSession.PacketReceived" separator="_">
-  <group name="Ack"
+<histogram_suffixes name="Net.QuicSession.PacketReceived" separator="_">
+  <owner>rch@chromium.org</owner>
+  <suffix name="Ack"
       label="Only packets that were received by Chrome as well being part of
              connections via"/>
-  <group name="Nack"
+  <suffix name="Nack"
       label="Only packets that were missed by Chrome as well being part of
              connections via"/>
-  <group name="IsAnAck"
+  <suffix name="IsAnAck"
       label="Only packets that were probably solo ACK packets when recieved
              by Chrome as well being part of connections via"/>
-  <group name="IsNotAck"
+  <suffix name="IsNotAck"
       label="Only packets that were probably NOT solo ACK packets when
              recieved by Chrome as well being part of connections via"/>
   <affected-histogram name="Net.QuicSession.PacketReceived"/>
-</fieldtrial>
+</histogram_suffixes>
 
-<fieldtrial name="Net.QuicSession.PacketReceived_CONNECTION_TYPE" separator="_">
-  <group name="CONNECTION_UNKNOWN" label="WiFi are tallied."/>
-  <group name="CONNECTION_ETHERNET"
+<histogram_suffixes name="Net.QuicSession.PacketReceived_CONNECTION_TYPE"
+    separator="_">
+  <owner>rch@chromium.org</owner>
+  <suffix name="CONNECTION_UNKNOWN" label="WiFi are tallied."/>
+  <suffix name="CONNECTION_ETHERNET"
       label="ethernet are tallied, but this may include connections to a WiFi
              bridge."/>
-  <group name="CONNECTION_WIFI"
+  <suffix name="CONNECTION_WIFI"
       label="WiFi are tallied, but this may include connections to a mobile
              hotspot. Also check similar histograms that end in WIFI_802.11*
              for more details on some platforms."/>
-  <group name="CONNECTION_WIFI_ANCIENT"
+  <suffix name="CONNECTION_WIFI_ANCIENT"
       label="802.11 that are no longer standard are tallied."/>
-  <group name="CONNECTION_WIFI_802.11a" label="802.11a are tallied."/>
-  <group name="CONNECTION_WIFI_802.11b" label="802.11b are tallied."/>
-  <group name="CONNECTION_WIFI_802.11g" label="802.11g are tallied."/>
-  <group name="CONNECTION_WIFI_802.11n" label="802.11n are tallied."/>
-  <group name="CONNECTION_2G" label="mobile 2G are tallied."/>
-  <group name="CONNECTION_3G" label="mobile 3G are tallied."/>
-  <group name="CONNECTION_4G" label="mobile 4G are tallied."/>
-  <group name="CONNECTION_NONE"
+  <suffix name="CONNECTION_WIFI_802.11a" label="802.11a are tallied."/>
+  <suffix name="CONNECTION_WIFI_802.11b" label="802.11b are tallied."/>
+  <suffix name="CONNECTION_WIFI_802.11g" label="802.11g are tallied."/>
+  <suffix name="CONNECTION_WIFI_802.11n" label="802.11n are tallied."/>
+  <suffix name="CONNECTION_2G" label="mobile 2G are tallied."/>
+  <suffix name="CONNECTION_3G" label="mobile 3G are tallied."/>
+  <suffix name="CONNECTION_4G" label="mobile 4G are tallied."/>
+  <suffix name="CONNECTION_NONE"
       label="NO(?) network are tallied (should be empty)."/>
+  <suffix name="CONNECTION_BLUETOOTH"
+      label="Bluetooth are tallied, but this may include connections to a
+             mobile hotspot."/>
   <affected-histogram
       name="Net.QuicSession.21CumulativePacketsReceived_First21"/>
   <affected-histogram
@@ -41909,73 +46977,75 @@ other types of suffix sets.
   <affected-histogram name="Net.QuicSession.PacketReceived_IsAnAck"/>
   <affected-histogram name="Net.QuicSession.PacketReceived_IsNotAck"/>
   <affected-histogram name="Net.QuicSession.PacketReceived_Nack"/>
-</fieldtrial>
+</histogram_suffixes>
 
-<fieldtrial name="NetConnectivity" separator=".">
-  <group name="53.100B" label="100 bytes of data on port 53."/>
-  <group name="53.100B.NoProxy"
+<histogram_suffixes name="NetConnectivity" separator=".">
+  <suffix name="53.100B" label="100 bytes of data on port 53."/>
+  <suffix name="53.100B.NoProxy"
       label="100 bytes of data on port 53 with no proxy."/>
-  <group name="53.1K" label="1K bytes of data on port 53."/>
-  <group name="53.1K.NoProxy"
+  <suffix name="53.1K" label="1K bytes of data on port 53."/>
+  <suffix name="53.1K.NoProxy"
       label="1K bytes of data on port 53 with no proxy."/>
-  <group name="53.100B.RTT" label="100 bytes of data on port 53 successfully."/>
-  <group name="53.100B.RTT.NoProxy"
+  <suffix name="53.100B.RTT"
+      label="100 bytes of data on port 53 successfully."/>
+  <suffix name="53.100B.RTT.NoProxy"
       label="100 bytes of data on port 53 successfully with no proxy."/>
-  <group name="53.1K.RTT" label="1K bytes of data on port 53 successfully."/>
-  <group name="53.1K.RTT.NoProxy"
+  <suffix name="53.1K.RTT" label="1K bytes of data on port 53 successfully."/>
+  <suffix name="53.1K.RTT.NoProxy"
       label="1K bytes of data on port 53 successfully with no proxy."/>
-  <group name="587.100B" label="100 bytes of data on port 587."/>
-  <group name="587.100B.NoProxy"
+  <suffix name="587.100B" label="100 bytes of data on port 587."/>
+  <suffix name="587.100B.NoProxy"
       label="100 bytes of data on port 587 with no proxy."/>
-  <group name="587.1K" label="1K bytes of data on port 587."/>
-  <group name="587.1K.NoProxy"
+  <suffix name="587.1K" label="1K bytes of data on port 587."/>
+  <suffix name="587.1K.NoProxy"
       label="1K bytes of data on port 587 with no proxy."/>
-  <group name="587.100B.RTT"
+  <suffix name="587.100B.RTT"
       label="100 bytes of data on port 587 successfully."/>
-  <group name="587.100B.RTT.NoProxy"
+  <suffix name="587.100B.RTT.NoProxy"
       label="100 bytes of data on port 587 successfully with no proxy."/>
-  <group name="587.1K.RTT" label="1K bytes of data on port 587 successfully."/>
-  <group name="587.1K.RTT.NoProxy"
+  <suffix name="587.1K.RTT" label="1K bytes of data on port 587 successfully."/>
+  <suffix name="587.1K.RTT.NoProxy"
       label="1K bytes of data on port 587 successfully with no proxy."/>
-  <group name="6121.100B" label="100 bytes of data on port 6121."/>
-  <group name="6121.100B.NoProxy"
+  <suffix name="6121.100B" label="100 bytes of data on port 6121."/>
+  <suffix name="6121.100B.NoProxy"
       label="100 bytes of data on port 6121 with no proxy."/>
-  <group name="6121.1K" label="1K bytes of data on port 6121."/>
-  <group name="6121.1K.NoProxy"
+  <suffix name="6121.1K" label="1K bytes of data on port 6121."/>
+  <suffix name="6121.1K.NoProxy"
       label="1K bytes of data on port 6121 with no proxy."/>
-  <group name="6121.100B.RTT"
+  <suffix name="6121.100B.RTT"
       label="100 bytes of data on port 6121 successfully."/>
-  <group name="6121.100B.RTT.NoProxy"
+  <suffix name="6121.100B.RTT.NoProxy"
       label="100 bytes of data on port 6121 successfully with no proxy."/>
-  <group name="6121.1K.RTT"
+  <suffix name="6121.1K.RTT"
       label="1K bytes of data on port 6121 successfully."/>
-  <group name="6121.1K.RTT.NoProxy"
+  <suffix name="6121.1K.RTT.NoProxy"
       label="1K bytes of data on port 6121 successfully with no proxy."/>
-  <group name="80.100B" label="100 bytes of data on port 80."/>
-  <group name="80.100B.NoProxy"
+  <suffix name="80.100B" label="100 bytes of data on port 80."/>
+  <suffix name="80.100B.NoProxy"
       label="100 bytes of data on port 80 with no proxy."/>
-  <group name="80.1K" label="1K bytes of data on port 80."/>
-  <group name="80.1K.NoProxy"
+  <suffix name="80.1K" label="1K bytes of data on port 80."/>
+  <suffix name="80.1K.NoProxy"
       label="1K bytes of data on port 80 with no proxy."/>
-  <group name="80.100B.RTT" label="100 bytes of data on port 80 successfully."/>
-  <group name="80.100B.RTT.NoProxy"
+  <suffix name="80.100B.RTT"
+      label="100 bytes of data on port 80 successfully."/>
+  <suffix name="80.100B.RTT.NoProxy"
       label="100 bytes of data on port 80 successfully with no proxy."/>
-  <group name="80.1K.RTT" label="1K bytes of data on port 80 successfully."/>
-  <group name="80.1K.RTT.NoProxy"
+  <suffix name="80.1K.RTT" label="1K bytes of data on port 80 successfully."/>
+  <suffix name="80.1K.RTT.NoProxy"
       label="1K bytes of data on port 80 successfully with no proxy."/>
-  <group name="8080.100B" label="100 bytes of data on port 8080."/>
-  <group name="8080.100B.NoProxy"
+  <suffix name="8080.100B" label="100 bytes of data on port 8080."/>
+  <suffix name="8080.100B.NoProxy"
       label="100 bytes of data on port 8080 with no proxy."/>
-  <group name="8080.1K" label="1K bytes of data on port 8080."/>
-  <group name="8080.1K.NoProxy"
+  <suffix name="8080.1K" label="1K bytes of data on port 8080."/>
+  <suffix name="8080.1K.NoProxy"
       label="1K bytes of data on port 8080 with no proxy."/>
-  <group name="8080.100B.RTT"
+  <suffix name="8080.100B.RTT"
       label="100 bytes of data on port 8080 successfully."/>
-  <group name="8080.100B.RTT.NoProxy"
+  <suffix name="8080.100B.RTT.NoProxy"
       label="100 bytes of data on port 8080 successfully with no proxy."/>
-  <group name="8080.1K.RTT"
+  <suffix name="8080.1K.RTT"
       label="1K bytes of data on port 8080 successfully."/>
-  <group name="8080.1K.RTT.NoProxy"
+  <suffix name="8080.1K.RTT.NoProxy"
       label="1K bytes of data on port 8080 successfully with no proxy."/>
   <affected-histogram name="NetConnectivity.TCP.Status"/>
   <affected-histogram name="NetConnectivity.TCP.Success"/>
@@ -41983,316 +47053,317 @@ other types of suffix sets.
   <affected-histogram name="NetConnectivity.UDP.PacketLoss6"/>
   <affected-histogram name="NetConnectivity.UDP.Status"/>
   <affected-histogram name="NetConnectivity.UDP.Success"/>
-</fieldtrial>
-
-<fieldtrial name="NetConnectivity2" separator=".">
-  <group name="AcksReceivedFromFirst2Packets" label="2 packets."/>
-  <group name="AcksReceivedFromFirst3Packets" label="3 packets."/>
-  <group name="AcksReceivedFromFirst4Packets" label="4 packets."/>
-  <group name="AcksReceivedFromFirst5Packets" label="5 packets."/>
-  <group name="AcksReceivedFromFirst6Packets" label="6 packets."/>
-  <group name="AcksReceivedFromFirst7Packets" label="7 packets."/>
-  <group name="AcksReceivedFromFirst8Packets" label="8 packets."/>
-  <group name="AcksReceivedFromFirst9Packets" label="9 packets."/>
-  <group name="AcksReceivedFromFirst10Packets" label="10 packets."/>
-  <group name="AcksReceivedFromFirst11Packets" label="11 packets."/>
-  <group name="AcksReceivedFromFirst12Packets" label="12 packets."/>
-  <group name="AcksReceivedFromFirst13Packets" label="13 packets."/>
-  <group name="AcksReceivedFromFirst14Packets" label="14 packets."/>
-  <group name="AcksReceivedFromFirst15Packets" label="15 packets."/>
-  <group name="AcksReceivedFromFirst16Packets" label="16 packets."/>
-  <group name="AcksReceivedFromFirst17Packets" label="17 packets."/>
-  <group name="AcksReceivedFromFirst18Packets" label="18 packets."/>
-  <group name="AcksReceivedFromFirst19Packets" label="19 packets."/>
-  <group name="AcksReceivedFromFirst20Packets" label="20 packets."/>
-  <group name="AcksReceivedFromFirst21Packets" label="21 packets."/>
+</histogram_suffixes>
+
+<histogram_suffixes name="NetConnectivity2" separator=".">
+  <suffix name="AcksReceivedFromFirst2Packets" label="2 packets."/>
+  <suffix name="AcksReceivedFromFirst3Packets" label="3 packets."/>
+  <suffix name="AcksReceivedFromFirst4Packets" label="4 packets."/>
+  <suffix name="AcksReceivedFromFirst5Packets" label="5 packets."/>
+  <suffix name="AcksReceivedFromFirst6Packets" label="6 packets."/>
+  <suffix name="AcksReceivedFromFirst7Packets" label="7 packets."/>
+  <suffix name="AcksReceivedFromFirst8Packets" label="8 packets."/>
+  <suffix name="AcksReceivedFromFirst9Packets" label="9 packets."/>
+  <suffix name="AcksReceivedFromFirst10Packets" label="10 packets."/>
+  <suffix name="AcksReceivedFromFirst11Packets" label="11 packets."/>
+  <suffix name="AcksReceivedFromFirst12Packets" label="12 packets."/>
+  <suffix name="AcksReceivedFromFirst13Packets" label="13 packets."/>
+  <suffix name="AcksReceivedFromFirst14Packets" label="14 packets."/>
+  <suffix name="AcksReceivedFromFirst15Packets" label="15 packets."/>
+  <suffix name="AcksReceivedFromFirst16Packets" label="16 packets."/>
+  <suffix name="AcksReceivedFromFirst17Packets" label="17 packets."/>
+  <suffix name="AcksReceivedFromFirst18Packets" label="18 packets."/>
+  <suffix name="AcksReceivedFromFirst19Packets" label="19 packets."/>
+  <suffix name="AcksReceivedFromFirst20Packets" label="20 packets."/>
+  <suffix name="AcksReceivedFromFirst21Packets" label="21 packets."/>
   <affected-histogram name="NetConnectivity.Sent21"/>
-</fieldtrial>
+</histogram_suffixes>
 
-<fieldtrial name="NetConnectivity2a" separator=".">
-  <group name="6121.100B" label="100 bytes of data is sent on port 6121."/>
-  <group name="6121.500B" label="500 bytes of data is sent on port 6121."/>
-  <group name="6121.1K" label="1K bytes of data is sent on port 6121."/>
+<histogram_suffixes name="NetConnectivity2a" separator=".">
+  <suffix name="6121.100B" label="100 bytes of data is sent on port 6121."/>
+  <suffix name="6121.500B" label="500 bytes of data is sent on port 6121."/>
+  <suffix name="6121.1K" label="1K bytes of data is sent on port 6121."/>
   <affected-histogram name="NetConnectivity2.Sent21.AckReceivedForNthPacket"/>
   <affected-histogram name="NetConnectivity2.Sent21.GotAnAck"/>
   <affected-histogram name="NetConnectivity2.Sent21.PacketsSent"/>
-</fieldtrial>
+</histogram_suffixes>
 
-<fieldtrial name="NetConnectivity2b" separator=".">
-  <group name="AcksReceivedFromFirst2Packets.6121.100B"
+<histogram_suffixes name="NetConnectivity2b" separator=".">
+  <suffix name="AcksReceivedFromFirst2Packets.6121.100B"
       label="2 packets. 100 bytes of data is sent on port 6121."/>
-  <group name="AcksReceivedFromFirst3Packets.6121.100B"
+  <suffix name="AcksReceivedFromFirst3Packets.6121.100B"
       label="3 packets. 100 bytes of data is sent on port 6121."/>
-  <group name="AcksReceivedFromFirst4Packets.6121.100B"
+  <suffix name="AcksReceivedFromFirst4Packets.6121.100B"
       label="4 packets. 100 bytes of data is sent on port 6121."/>
-  <group name="AcksReceivedFromFirst5Packets.6121.100B"
+  <suffix name="AcksReceivedFromFirst5Packets.6121.100B"
       label="5 packets. 100 bytes of data is sent on port 6121."/>
-  <group name="AcksReceivedFromFirst6Packets.6121.100B"
+  <suffix name="AcksReceivedFromFirst6Packets.6121.100B"
       label="6 packets. 100 bytes of data is sent on port 6121."/>
-  <group name="AcksReceivedFromFirst7Packets.6121.100B"
+  <suffix name="AcksReceivedFromFirst7Packets.6121.100B"
       label="7 packets. 100 bytes of data is sent on port 6121."/>
-  <group name="AcksReceivedFromFirst8Packets.6121.100B"
+  <suffix name="AcksReceivedFromFirst8Packets.6121.100B"
       label="8 packets. 100 bytes of data is sent on port 6121."/>
-  <group name="AcksReceivedFromFirst9Packets.6121.100B"
+  <suffix name="AcksReceivedFromFirst9Packets.6121.100B"
       label="9 packets. 100 bytes of data is sent on port 6121."/>
-  <group name="AcksReceivedFromFirst10Packets.6121.100B"
+  <suffix name="AcksReceivedFromFirst10Packets.6121.100B"
       label="10 packets. 100 bytes of data is sent on port 6121."/>
-  <group name="AcksReceivedFromFirst11Packets.6121.100B"
+  <suffix name="AcksReceivedFromFirst11Packets.6121.100B"
       label="11 packets. 100 bytes of data is sent on port 6121."/>
-  <group name="AcksReceivedFromFirst12Packets.6121.100B"
+  <suffix name="AcksReceivedFromFirst12Packets.6121.100B"
       label="12 packets. 100 bytes of data is sent on port 6121."/>
-  <group name="AcksReceivedFromFirst13Packets.6121.100B"
+  <suffix name="AcksReceivedFromFirst13Packets.6121.100B"
       label="13 packets. 100 bytes of data is sent on port 6121."/>
-  <group name="AcksReceivedFromFirst14Packets.6121.100B"
+  <suffix name="AcksReceivedFromFirst14Packets.6121.100B"
       label="14 packets. 100 bytes of data is sent on port 6121."/>
-  <group name="AcksReceivedFromFirst15Packets.6121.100B"
+  <suffix name="AcksReceivedFromFirst15Packets.6121.100B"
       label="15 packets. 100 bytes of data is sent on port 6121."/>
-  <group name="AcksReceivedFromFirst16Packets.6121.100B"
+  <suffix name="AcksReceivedFromFirst16Packets.6121.100B"
       label="16 packets. 100 bytes of data is sent on port 6121."/>
-  <group name="AcksReceivedFromFirst17Packets.6121.100B"
+  <suffix name="AcksReceivedFromFirst17Packets.6121.100B"
       label="17 packets. 100 bytes of data is sent on port 6121."/>
-  <group name="AcksReceivedFromFirst18Packets.6121.100B"
+  <suffix name="AcksReceivedFromFirst18Packets.6121.100B"
       label="18 packets. 100 bytes of data is sent on port 6121."/>
-  <group name="AcksReceivedFromFirst19Packets.6121.100B"
+  <suffix name="AcksReceivedFromFirst19Packets.6121.100B"
       label="19 packets. 100 bytes of data is sent on port 6121."/>
-  <group name="AcksReceivedFromFirst20Packets.6121.100B"
+  <suffix name="AcksReceivedFromFirst20Packets.6121.100B"
       label="20 packets. 100 bytes of data is sent on port 6121."/>
-  <group name="AcksReceivedFromFirst21Packets.6121.100B"
+  <suffix name="AcksReceivedFromFirst21Packets.6121.100B"
       label="21 packets. 100 bytes of data is sent on port 6121."/>
   <affected-histogram name="NetConnectivity2.Sent21"/>
-</fieldtrial>
+</histogram_suffixes>
 
-<fieldtrial name="NetConnectivity2c" separator=".">
-  <group name="6121.100B" label="100 bytes of data is sent on port 6121."/>
-  <group name="6121.100B.NoProxy"
+<histogram_suffixes name="NetConnectivity2c" separator=".">
+  <suffix name="6121.100B" label="100 bytes of data is sent on port 6121."/>
+  <suffix name="6121.100B.NoProxy"
       label="100 bytes of data is sent on port 6121 with no proxy."/>
-  <group name="6121.500B" label="500 bytes of data is sent on port 6121."/>
-  <group name="6121.500B.NoProxy"
+  <suffix name="6121.500B" label="500 bytes of data is sent on port 6121."/>
+  <suffix name="6121.500B.NoProxy"
       label="500 bytes of data is sent on port 6121 with no proxy."/>
-  <group name="6121.1K" label="1K bytes of data is sent on port 6121."/>
-  <group name="6121.1K.NoProxy"
+  <suffix name="6121.1K" label="1K bytes of data is sent on port 6121."/>
+  <suffix name="6121.1K.NoProxy"
       label="1K bytes of data is sent on port 6121 with no proxy."/>
   <affected-histogram name="NetConnectivity2.Send6.PacketsSent"/>
   <affected-histogram name="NetConnectivity2.Send6.SeriesAcked"/>
-</fieldtrial>
+</histogram_suffixes>
 
-<fieldtrial name="NetConnectivity2d" separator=".">
-  <group name="AcksReceivedFromFirst2Packets.6121.500B"
+<histogram_suffixes name="NetConnectivity2d" separator=".">
+  <suffix name="AcksReceivedFromFirst2Packets.6121.500B"
       label="2 packets. 500 bytes of data is sent on port 6121."/>
-  <group name="AcksReceivedFromFirst3Packets.6121.500B"
+  <suffix name="AcksReceivedFromFirst3Packets.6121.500B"
       label="3 packets. 500 bytes of data is sent on port 6121."/>
-  <group name="AcksReceivedFromFirst4Packets.6121.500B"
+  <suffix name="AcksReceivedFromFirst4Packets.6121.500B"
       label="4 packets. 500 bytes of data is sent on port 6121."/>
-  <group name="AcksReceivedFromFirst5Packets.6121.500B"
+  <suffix name="AcksReceivedFromFirst5Packets.6121.500B"
       label="5 packets. 500 bytes of data is sent on port 6121."/>
-  <group name="AcksReceivedFromFirst6Packets.6121.500B"
+  <suffix name="AcksReceivedFromFirst6Packets.6121.500B"
       label="6 packets. 500 bytes of data is sent on port 6121."/>
-  <group name="AcksReceivedFromFirst7Packets.6121.500B"
+  <suffix name="AcksReceivedFromFirst7Packets.6121.500B"
       label="7 packets. 500 bytes of data is sent on port 6121."/>
-  <group name="AcksReceivedFromFirst8Packets.6121.500B"
+  <suffix name="AcksReceivedFromFirst8Packets.6121.500B"
       label="8 packets. 500 bytes of data is sent on port 6121."/>
-  <group name="AcksReceivedFromFirst9Packets.6121.500B"
+  <suffix name="AcksReceivedFromFirst9Packets.6121.500B"
       label="9 packets. 500 bytes of data is sent on port 6121."/>
-  <group name="AcksReceivedFromFirst10Packets.6121.500B"
+  <suffix name="AcksReceivedFromFirst10Packets.6121.500B"
       label="10 packets. 500 bytes of data is sent on port 6121."/>
-  <group name="AcksReceivedFromFirst11Packets.6121.500B"
+  <suffix name="AcksReceivedFromFirst11Packets.6121.500B"
       label="11 packets. 500 bytes of data is sent on port 6121."/>
-  <group name="AcksReceivedFromFirst12Packets.6121.500B"
+  <suffix name="AcksReceivedFromFirst12Packets.6121.500B"
       label="12 packets. 500 bytes of data is sent on port 6121."/>
-  <group name="AcksReceivedFromFirst13Packets.6121.500B"
+  <suffix name="AcksReceivedFromFirst13Packets.6121.500B"
       label="13 packets. 500 bytes of data is sent on port 6121."/>
-  <group name="AcksReceivedFromFirst14Packets.6121.500B"
+  <suffix name="AcksReceivedFromFirst14Packets.6121.500B"
       label="14 packets. 500 bytes of data is sent on port 6121."/>
-  <group name="AcksReceivedFromFirst15Packets.6121.500B"
+  <suffix name="AcksReceivedFromFirst15Packets.6121.500B"
       label="15 packets. 500 bytes of data is sent on port 6121."/>
-  <group name="AcksReceivedFromFirst16Packets.6121.500B"
+  <suffix name="AcksReceivedFromFirst16Packets.6121.500B"
       label="16 packets. 500 bytes of data is sent on port 6121."/>
-  <group name="AcksReceivedFromFirst17Packets.6121.500B"
+  <suffix name="AcksReceivedFromFirst17Packets.6121.500B"
       label="17 packets. 500 bytes of data is sent on port 6121."/>
-  <group name="AcksReceivedFromFirst18Packets.6121.500B"
+  <suffix name="AcksReceivedFromFirst18Packets.6121.500B"
       label="18 packets. 500 bytes of data is sent on port 6121."/>
-  <group name="AcksReceivedFromFirst19Packets.6121.500B"
+  <suffix name="AcksReceivedFromFirst19Packets.6121.500B"
       label="19 packets. 500 bytes of data is sent on port 6121."/>
-  <group name="AcksReceivedFromFirst20Packets.6121.500B"
+  <suffix name="AcksReceivedFromFirst20Packets.6121.500B"
       label="20 packets. 500 bytes of data is sent on port 6121."/>
-  <group name="AcksReceivedFromFirst21Packets.6121.500B"
+  <suffix name="AcksReceivedFromFirst21Packets.6121.500B"
       label="21 packets. 500 bytes of data is sent on port 6121."/>
   <affected-histogram name="NetConnectivity2.Sent21"/>
-</fieldtrial>
+</histogram_suffixes>
 
-<fieldtrial name="NetConnectivity2e" separator=".">
-  <group name="AcksReceivedFromFirst2Packets.6121.1K"
+<histogram_suffixes name="NetConnectivity2e" separator=".">
+  <suffix name="AcksReceivedFromFirst2Packets.6121.1K"
       label="2 packets. 1K bytes of data is sent on port 6121."/>
-  <group name="AcksReceivedFromFirst3Packets.6121.1K"
+  <suffix name="AcksReceivedFromFirst3Packets.6121.1K"
       label="3 packets. 1K bytes of data is sent on port 6121."/>
-  <group name="AcksReceivedFromFirst4Packets.6121.1K"
+  <suffix name="AcksReceivedFromFirst4Packets.6121.1K"
       label="4 packets. 1K bytes of data is sent on port 6121."/>
-  <group name="AcksReceivedFromFirst5Packets.6121.1K"
+  <suffix name="AcksReceivedFromFirst5Packets.6121.1K"
       label="5 packets. 1K bytes of data is sent on port 6121."/>
-  <group name="AcksReceivedFromFirst6Packets.6121.1K"
+  <suffix name="AcksReceivedFromFirst6Packets.6121.1K"
       label="6 packets. 1K bytes of data is sent on port 6121."/>
-  <group name="AcksReceivedFromFirst7Packets.6121.1K"
+  <suffix name="AcksReceivedFromFirst7Packets.6121.1K"
       label="7 packets. 1K bytes of data is sent on port 6121."/>
-  <group name="AcksReceivedFromFirst8Packets.6121.1K"
+  <suffix name="AcksReceivedFromFirst8Packets.6121.1K"
       label="8 packets. 1K bytes of data is sent on port 6121."/>
-  <group name="AcksReceivedFromFirst9Packets.6121.1K"
+  <suffix name="AcksReceivedFromFirst9Packets.6121.1K"
       label="9 packets. 1K bytes of data is sent on port 6121."/>
-  <group name="AcksReceivedFromFirst10Packets.6121.1K"
+  <suffix name="AcksReceivedFromFirst10Packets.6121.1K"
       label="10 packets. 1K bytes of data is sent on port 6121."/>
-  <group name="AcksReceivedFromFirst11Packets.6121.1K"
+  <suffix name="AcksReceivedFromFirst11Packets.6121.1K"
       label="11 packets. 1K bytes of data is sent on port 6121."/>
-  <group name="AcksReceivedFromFirst12Packets.6121.1K"
+  <suffix name="AcksReceivedFromFirst12Packets.6121.1K"
       label="12 packets. 1K bytes of data is sent on port 6121."/>
-  <group name="AcksReceivedFromFirst13Packets.6121.1K"
+  <suffix name="AcksReceivedFromFirst13Packets.6121.1K"
       label="13 packets. 1K bytes of data is sent on port 6121."/>
-  <group name="AcksReceivedFromFirst14Packets.6121.1K"
+  <suffix name="AcksReceivedFromFirst14Packets.6121.1K"
       label="14 packets. 1K bytes of data is sent on port 6121."/>
-  <group name="AcksReceivedFromFirst15Packets.6121.1K"
+  <suffix name="AcksReceivedFromFirst15Packets.6121.1K"
       label="15 packets. 1K bytes of data is sent on port 6121."/>
-  <group name="AcksReceivedFromFirst16Packets.6121.1K"
+  <suffix name="AcksReceivedFromFirst16Packets.6121.1K"
       label="16 packets. 1K bytes of data is sent on port 6121."/>
-  <group name="AcksReceivedFromFirst17Packets.6121.1K"
+  <suffix name="AcksReceivedFromFirst17Packets.6121.1K"
       label="17 packets. 1K bytes of data is sent on port 6121."/>
-  <group name="AcksReceivedFromFirst18Packets.6121.1K"
+  <suffix name="AcksReceivedFromFirst18Packets.6121.1K"
       label="18 packets. 1K bytes of data is sent on port 6121."/>
-  <group name="AcksReceivedFromFirst19Packets.6121.1K"
+  <suffix name="AcksReceivedFromFirst19Packets.6121.1K"
       label="19 packets. 1K bytes of data is sent on port 6121."/>
-  <group name="AcksReceivedFromFirst20Packets.6121.1K"
+  <suffix name="AcksReceivedFromFirst20Packets.6121.1K"
       label="20 packets. 1K bytes of data is sent on port 6121."/>
-  <group name="AcksReceivedFromFirst21Packets.6121.1K"
+  <suffix name="AcksReceivedFromFirst21Packets.6121.1K"
       label="21 packets. 1K bytes of data is sent on port 6121."/>
   <affected-histogram name="NetConnectivity2.Sent21"/>
-</fieldtrial>
+</histogram_suffixes>
 
-<fieldtrial name="NetConnectivity3a" separator=".">
-  <group name="NonPacedPacket"
+<histogram_suffixes name="NetConnectivity3a" separator=".">
+  <suffix name="NonPacedPacket"
       label="In this histogram results are only shown if at least two packets
              were ACKed in the Startup Test. Packets were sent as rapidly as
              possible."/>
-  <group name="PacedPacket"
+  <suffix name="PacedPacket"
       label="In this histogram results are only shown if at least two packets
              were ACKed in the Startup Test. Packets are sent at equal
              intervals. The interval is selected to match the bandwidth
              discovered during the StartPacket test."/>
-  <group name="StartPacket"
+  <suffix name="StartPacket"
       label="Packets are sent as rapidly as possible, just after successfully
              sending an UMA upload. Each packet was numbered, as was its ACK
              sent back by Google. If no packets (of the 21) were ever ACKed,
              then the port is assumed to be blocked, and no data is recorded
              in this histogram."/>
   <affected-histogram name="NetConnectivity3"/>
-</fieldtrial>
+</histogram_suffixes>
 
-<fieldtrial name="NetConnectivity3aa" separator=".">
-  <group name="Sent21"
+<histogram_suffixes name="NetConnectivity3aa" separator=".">
+  <suffix name="Sent21"
       label="This histogram shows the number of echo responses received from
              the first"/>
   <affected-histogram name="NetConnectivity3.NonPacedPacket"/>
   <affected-histogram name="NetConnectivity3.PacedPacket"/>
   <affected-histogram name="NetConnectivity3.StartPacket"/>
-</fieldtrial>
+</histogram_suffixes>
 
-<fieldtrial name="NetConnectivity3AckReceivedForNthPacket" separator=".">
-  <group name="Sent21.AckReceivedForNthPacket"
+<histogram_suffixes name="NetConnectivity3AckReceivedForNthPacket"
+    separator=".">
+  <suffix name="Sent21.AckReceivedForNthPacket"
       label="Each packet was numbered, as was its ACK sent back by Google.
              This histogram records, for each packet number, how often we
              received an ACK for that packet."/>
   <affected-histogram name="NetConnectivity3.NonPacedPacket"/>
   <affected-histogram name="NetConnectivity3.PacedPacket"/>
   <affected-histogram name="NetConnectivity3.StartPacket"/>
-</fieldtrial>
-
-<fieldtrial name="NetConnectivity3AcksReceivedFromFirst" separator=".">
-  <group name="AcksReceivedFromFirst02Packets" label="2 packets."/>
-  <group name="AcksReceivedFromFirst03Packets" label="3 packets."/>
-  <group name="AcksReceivedFromFirst04Packets" label="4 packets."/>
-  <group name="AcksReceivedFromFirst05Packets" label="5 packets."/>
-  <group name="AcksReceivedFromFirst06Packets" label="6 packets."/>
-  <group name="AcksReceivedFromFirst07Packets" label="7 packets."/>
-  <group name="AcksReceivedFromFirst08Packets" label="8 packets."/>
-  <group name="AcksReceivedFromFirst09Packets" label="9 packets."/>
-  <group name="AcksReceivedFromFirst10Packets" label="10 packets."/>
-  <group name="AcksReceivedFromFirst11Packets" label="11 packets."/>
-  <group name="AcksReceivedFromFirst12Packets" label="12 packets."/>
-  <group name="AcksReceivedFromFirst13Packets" label="13 packets."/>
-  <group name="AcksReceivedFromFirst14Packets" label="14 packets."/>
-  <group name="AcksReceivedFromFirst15Packets" label="15 packets."/>
-  <group name="AcksReceivedFromFirst16Packets" label="16 packets."/>
-  <group name="AcksReceivedFromFirst17Packets" label="17 packets."/>
-  <group name="AcksReceivedFromFirst18Packets" label="18 packets."/>
-  <group name="AcksReceivedFromFirst19Packets" label="19 packets."/>
-  <group name="AcksReceivedFromFirst20Packets" label="20 packets."/>
-  <group name="AcksReceivedFromFirst21Packets" label="21 packets."/>
+</histogram_suffixes>
+
+<histogram_suffixes name="NetConnectivity3AcksReceivedFromFirst" separator=".">
+  <suffix name="AcksReceivedFromFirst02Packets" label="2 packets."/>
+  <suffix name="AcksReceivedFromFirst03Packets" label="3 packets."/>
+  <suffix name="AcksReceivedFromFirst04Packets" label="4 packets."/>
+  <suffix name="AcksReceivedFromFirst05Packets" label="5 packets."/>
+  <suffix name="AcksReceivedFromFirst06Packets" label="6 packets."/>
+  <suffix name="AcksReceivedFromFirst07Packets" label="7 packets."/>
+  <suffix name="AcksReceivedFromFirst08Packets" label="8 packets."/>
+  <suffix name="AcksReceivedFromFirst09Packets" label="9 packets."/>
+  <suffix name="AcksReceivedFromFirst10Packets" label="10 packets."/>
+  <suffix name="AcksReceivedFromFirst11Packets" label="11 packets."/>
+  <suffix name="AcksReceivedFromFirst12Packets" label="12 packets."/>
+  <suffix name="AcksReceivedFromFirst13Packets" label="13 packets."/>
+  <suffix name="AcksReceivedFromFirst14Packets" label="14 packets."/>
+  <suffix name="AcksReceivedFromFirst15Packets" label="15 packets."/>
+  <suffix name="AcksReceivedFromFirst16Packets" label="16 packets."/>
+  <suffix name="AcksReceivedFromFirst17Packets" label="17 packets."/>
+  <suffix name="AcksReceivedFromFirst18Packets" label="18 packets."/>
+  <suffix name="AcksReceivedFromFirst19Packets" label="19 packets."/>
+  <suffix name="AcksReceivedFromFirst20Packets" label="20 packets."/>
+  <suffix name="AcksReceivedFromFirst21Packets" label="21 packets."/>
   <affected-histogram name="NetConnectivity3.NonPacedPacket.Sent21"/>
   <affected-histogram name="NetConnectivity3.PacedPacket.Sent21"/>
   <affected-histogram name="NetConnectivity3.StartPacket.Sent21"/>
-</fieldtrial>
+</histogram_suffixes>
 
-<fieldtrial name="NetConnectivity3GotAnAck" separator=".">
-  <group name="Sent21.GotAnAck"
+<histogram_suffixes name="NetConnectivity3GotAnAck" separator=".">
+  <suffix name="Sent21.GotAnAck"
       label="The histogram shows if we ever got an ACK for a packet in our
              series of 21."/>
   <affected-histogram name="NetConnectivity3.NonPacedPacket"/>
   <affected-histogram name="NetConnectivity3.PacedPacket"/>
   <affected-histogram name="NetConnectivity3.StartPacket"/>
-</fieldtrial>
+</histogram_suffixes>
 
-<fieldtrial name="NetConnectivity3PacketDelay1" separator=".">
-  <group name="Sent21.443"
+<histogram_suffixes name="NetConnectivity3PacketDelay1" separator=".">
+  <suffix name="Sent21.443"
       label="This histogram shows the difference between the time when we
              have received 1st byte from the server and the last time when we
              have received data from the server on port 443."/>
-  <group name="Sent21.6121"
+  <suffix name="Sent21.6121"
       label="This histogram shows the difference between the time when we
              have received 1st byte from the server and the last time when we
              have received data from the server on port 6121."/>
   <affected-histogram name="NetConnectivity3.NonPacedPacket"/>
   <affected-histogram name="NetConnectivity3.PacedPacket"/>
   <affected-histogram name="NetConnectivity3.StartPacket"/>
-</fieldtrial>
+</histogram_suffixes>
 
-<fieldtrial name="NetConnectivity3PacketDelay2" separator=".">
-  <group name="443.100B.PacketDelay"
+<histogram_suffixes name="NetConnectivity3PacketDelay2" separator=".">
+  <suffix name="443.100B.PacketDelay"
       label="100 bytes of data is sent on port 443."/>
-  <group name="443.1200B.PacketDelay"
+  <suffix name="443.1200B.PacketDelay"
       label="1200 bytes of data is sent on port 443."/>
-  <group name="443.500B.PacketDelay"
+  <suffix name="443.500B.PacketDelay"
       label="500 bytes of data is sent on port 443."/>
-  <group name="6121.100B.PacketDelay"
+  <suffix name="6121.100B.PacketDelay"
       label="100 bytes of data is sent on port 6121."/>
-  <group name="6121.1200B.PacketDelay"
+  <suffix name="6121.1200B.PacketDelay"
       label="1200 bytes of data is sent on port 6121."/>
-  <group name="6121.500B.PacketDelay"
+  <suffix name="6121.500B.PacketDelay"
       label="500 bytes of data is sent on port 6121."/>
   <affected-histogram name="NetConnectivity3.NonPacedPacket.Sent21"/>
   <affected-histogram name="NetConnectivity3.PacedPacket.Sent21"/>
   <affected-histogram name="NetConnectivity3.StartPacket.Sent21"/>
-</fieldtrial>
+</histogram_suffixes>
 
-<fieldtrial name="NetConnectivity3PacketRTT" separator=".">
-  <group name="Sent21.Success.RTT" label="The histogram shows the RTT for"/>
+<histogram_suffixes name="NetConnectivity3PacketRTT" separator=".">
+  <suffix name="Sent21.Success.RTT" label="The histogram shows the RTT for"/>
   <affected-histogram name="NetConnectivity3.NonPacedPacket"/>
   <affected-histogram name="NetConnectivity3.PacedPacket"/>
   <affected-histogram name="NetConnectivity3.StartPacket"/>
-</fieldtrial>
+</histogram_suffixes>
 
-<fieldtrial name="NetConnectivity3Packets" separator=".">
-  <group name="Packet01" label="1st packet."/>
-  <group name="Packet02" label="2nd packet."/>
-  <group name="Packet03" label="3rd packet."/>
-  <group name="Packet10" label="10th packet."/>
-  <group name="Packet20" label="20th packet."/>
+<histogram_suffixes name="NetConnectivity3Packets" separator=".">
+  <suffix name="Packet01" label="1st packet."/>
+  <suffix name="Packet02" label="2nd packet."/>
+  <suffix name="Packet03" label="3rd packet."/>
+  <suffix name="Packet10" label="10th packet."/>
+  <suffix name="Packet20" label="20th packet."/>
   <affected-histogram
       name="NetConnectivity3.NonPacedPacket.Sent21.Success.RTT"/>
   <affected-histogram name="NetConnectivity3.PacedPacket.Sent21.Success.RTT"/>
   <affected-histogram name="NetConnectivity3.StartPacket.Sent21.Success.RTT"/>
-</fieldtrial>
+</histogram_suffixes>
 
-<fieldtrial name="NetConnectivity3PacketsSent" separator=".">
-  <group name="Sent21.PacketsSent"
+<histogram_suffixes name="NetConnectivity3PacketsSent" separator=".">
+  <suffix name="Sent21.PacketsSent"
       label="This histogram records how many packets (out of 21 attempted)
              were sent to the server via UDP."/>
-  <group name="Send6.SeriesAcked"
+  <suffix name="Send6.SeriesAcked"
       label="Chrome sends 6 UDP packets in a row to test to see if there is a
              probabalistic dependency in packet loss for consecutive packets.
              We record a bit vector of packets received, where the least
@@ -42303,15 +47374,15 @@ other types of suffix sets.
   <affected-histogram name="NetConnectivity3.NonPacedPacket"/>
   <affected-histogram name="NetConnectivity3.PacedPacket"/>
   <affected-histogram name="NetConnectivity3.StartPacket"/>
-</fieldtrial>
+</histogram_suffixes>
 
-<fieldtrial name="NetConnectivity3PacketsSentBytes" separator=".">
-  <group name="443.100B" label="100 bytes of data is sent on port 443."/>
-  <group name="443.500B" label="500 bytes of data is sent on port 443."/>
-  <group name="443.1200B" label="1200 bytes of data is sent on port 443."/>
-  <group name="6121.100B" label="100 bytes of data is sent on port 6121."/>
-  <group name="6121.500B" label="500 bytes of data is sent on port 6121."/>
-  <group name="6121.1200B" label="1200 bytes of data is sent on port 6121."/>
+<histogram_suffixes name="NetConnectivity3PacketsSentBytes" separator=".">
+  <suffix name="443.100B" label="100 bytes of data is sent on port 443."/>
+  <suffix name="443.500B" label="500 bytes of data is sent on port 443."/>
+  <suffix name="443.1200B" label="1200 bytes of data is sent on port 443."/>
+  <suffix name="6121.100B" label="100 bytes of data is sent on port 6121."/>
+  <suffix name="6121.500B" label="500 bytes of data is sent on port 6121."/>
+  <suffix name="6121.1200B" label="1200 bytes of data is sent on port 6121."/>
   <affected-histogram
       name="NetConnectivity3.NonPacedPacket.Sent21.AckReceivedForNthPacket"/>
   <affected-histogram
@@ -42475,78 +47546,78 @@ other types of suffix sets.
       name="NetConnectivity3.StartPacket.Sent21.Success.RTT.Packet10"/>
   <affected-histogram
       name="NetConnectivity3.StartPacket.Sent21.Success.RTT.Packet20"/>
-</fieldtrial>
+</histogram_suffixes>
 
-<fieldtrial name="NetConnectivity3Send6Acked" separator=".">
-  <group name="443.100B" label="100 bytes of data is sent on port 443."/>
-  <group name="443.100B.NoProxy"
+<histogram_suffixes name="NetConnectivity3Send6Acked" separator=".">
+  <suffix name="443.100B" label="100 bytes of data is sent on port 443."/>
+  <suffix name="443.100B.NoProxy"
       label="100 bytes of data is sent on port 443 with no proxy."/>
-  <group name="443.500B" label="500 bytes of data is sent on port 443."/>
-  <group name="443.500B.NoProxy"
+  <suffix name="443.500B" label="500 bytes of data is sent on port 443."/>
+  <suffix name="443.500B.NoProxy"
       label="500 bytes of data is sent on port 443 with no proxy."/>
-  <group name="443.1200B" label="1200 bytes of data is sent on port 443."/>
-  <group name="443.1200B.NoProxy"
+  <suffix name="443.1200B" label="1200 bytes of data is sent on port 443."/>
+  <suffix name="443.1200B.NoProxy"
       label="1200 bytes of data is sent on port 443 with no proxy."/>
-  <group name="6121.100B" label="100 bytes of data is sent on port 6121."/>
-  <group name="6121.100B.NoProxy"
+  <suffix name="6121.100B" label="100 bytes of data is sent on port 6121."/>
+  <suffix name="6121.100B.NoProxy"
       label="100 bytes of data is sent on port 6121 with no proxy."/>
-  <group name="6121.500B" label="500 bytes of data is sent on port 6121."/>
-  <group name="6121.500B.NoProxy"
+  <suffix name="6121.500B" label="500 bytes of data is sent on port 6121."/>
+  <suffix name="6121.500B.NoProxy"
       label="500 bytes of data is sent on port 6121 with no proxy."/>
-  <group name="6121.1200B" label="1200 bytes of data is sent on port 6121."/>
-  <group name="6121.1200B.NoProxy"
+  <suffix name="6121.1200B" label="1200 bytes of data is sent on port 6121."/>
+  <suffix name="6121.1200B.NoProxy"
       label="1200 bytes of data is sent on port 6121 with no proxy."/>
   <affected-histogram name="NetConnectivity3.NonPacedPacket.Send6.SeriesAcked"/>
   <affected-histogram name="NetConnectivity3.PacedPacket.Send6.SeriesAcked"/>
   <affected-histogram name="NetConnectivity3.StartPacket.Send6.PacketsSent"/>
   <affected-histogram name="NetConnectivity3.StartPacket.Send6.SeriesAcked"/>
-</fieldtrial>
+</histogram_suffixes>
 
-<fieldtrial name="NetConnectivity4a" separator=".">
-  <group name="NATBind.Sent2"
+<histogram_suffixes name="NetConnectivity4a" separator=".">
+  <suffix name="NATBind.Sent2"
       label="Two packets were sent spreading over a random period, to test if
              the NAT dropped the binding. Afterwords, an extra (short) packet
              was sent with renewed NAT binding to test whether the network
              that was used to deliver the first packet is still connected.
              Results are only shown in this histogram if at least ten packets
              were received in the StartPacket test."/>
-  <group name="NonPacedPacket"
+  <suffix name="NonPacedPacket"
       label="21 Packets were sent as rapidly as possible. Results are only
              shown in this histogram if at least two packets were received in
              the StartPacket Test."/>
-  <group name="PacedPacket"
+  <suffix name="PacedPacket"
       label="21 Packets were sent at equal intervals, which were selected to
              match the bandwidth discovered during the StartPacket test.
              Results are only shown in this histogram if at least two packets
              were received in the StartPacket Test."/>
-  <group name="StartPacket"
+  <suffix name="StartPacket"
       label="21 Packets were sent as rapidly as possible, just after the
              client successfully sent a UMA upload. Each packet was numbered
              when it was sent by Google."/>
   <affected-histogram name="NetConnectivity4"/>
   <affected-histogram name="NetConnectivity5"/>
-</fieldtrial>
+</histogram_suffixes>
 
-<fieldtrial name="NetConnectivity4NATBindPacketReceives" separator=".">
-  <group name="Bind.Failure"
+<histogram_suffixes name="NetConnectivity4NATBindPacketReceives" separator=".">
+  <suffix name="Bind.Failure"
       label="Only when the second packet never arrived (we wait for 10 extra
              seconds) and the first and the extra (short) packets arrived did
              we record the duration in seconds between the sendings of the
              first two packets in this histogram."/>
-  <group name="Bind.Success"
+  <suffix name="Bind.Success"
       label="Only when all three packets including the extra (short) packet
              arrived did we record the duration in seconds between the
              sendings of the first two packets in this histogram."/>
-  <group name="Connectivity.Failure"
+  <suffix name="Connectivity.Failure"
       label="Only when the extra (short) packet (with renewed NAT binding)
              never arrived (we wait for 10 extra seconds) did we record the
              duration in seconds between the sendings of the first two
              packets in this histogram."/>
-  <group name="Connectivity.Success"
+  <suffix name="Connectivity.Success"
       label="Only when the extra (short) packet arrived did we record the
              duration in seconds between the sendings of the first two
              packets in this histogram."/>
-  <group name="SendToLastRecvDelay"
+  <suffix name="SendToLastRecvDelay"
       label="This histogram records the time duration (in milliseconds)
              between the client sending the request and the receiving of the
              second packet sent from the server, excluding the idle time
@@ -42554,16 +47625,16 @@ other types of suffix sets.
              shown if the first two packets are both received."/>
   <affected-histogram name="NetConnectivity4.NATBind.Sent2"/>
   <affected-histogram name="NetConnectivity5.NATBind.Sent2"/>
-</fieldtrial>
+</histogram_suffixes>
 
-<fieldtrial name="NetConnectivity4PacketFirst6" separator=".">
-  <group name="First6.SeriesRecv"
+<histogram_suffixes name="NetConnectivity4PacketFirst6" separator=".">
+  <suffix name="First6.SeriesRecv"
       label="This histogram records a bit vector of the first 6 packets sent,
              where the least significant bit is a 1 if the first packet was
              received, etc. For example, if all packets other than packet 2
              and 4 are received, then we'd have a sample (in binary) of
              110101B, or 53."/>
-  <group name="Sent21"
+  <suffix name="Sent21"
       label="This histogram shows the number of packets received from the
              first"/>
   <affected-histogram name="NetConnectivity4.NonPacedPacket"/>
@@ -42572,75 +47643,76 @@ other types of suffix sets.
   <affected-histogram name="NetConnectivity5.NonPacedPacket"/>
   <affected-histogram name="NetConnectivity5.PacedPacket"/>
   <affected-histogram name="NetConnectivity5.StartPacket"/>
-</fieldtrial>
-
-<fieldtrial name="NetConnectivity4PacketReceives" separator=".">
-  <group name="NumRecvFromFirst01Packets" label="1 packet."/>
-  <group name="NumRecvFromFirst02Packets" label="2 packets."/>
-  <group name="NumRecvFromFirst03Packets" label="3 packets."/>
-  <group name="NumRecvFromFirst04Packets" label="4 packets."/>
-  <group name="NumRecvFromFirst05Packets" label="5 packets."/>
-  <group name="NumRecvFromFirst06Packets" label="6 packets."/>
-  <group name="NumRecvFromFirst07Packets" label="7 packets."/>
-  <group name="NumRecvFromFirst08Packets" label="8 packets."/>
-  <group name="NumRecvFromFirst09Packets" label="9 packets."/>
-  <group name="NumRecvFromFirst10Packets" label="10 packets."/>
-  <group name="NumRecvFromFirst11Packets" label="11 packets."/>
-  <group name="NumRecvFromFirst12Packets" label="12 packets."/>
-  <group name="NumRecvFromFirst13Packets" label="13 packets."/>
-  <group name="NumRecvFromFirst14Packets" label="14 packets."/>
-  <group name="NumRecvFromFirst15Packets" label="15 packets."/>
-  <group name="NumRecvFromFirst16Packets" label="16 packets."/>
-  <group name="NumRecvFromFirst17Packets" label="17 packets."/>
-  <group name="NumRecvFromFirst18Packets" label="18 packets."/>
-  <group name="NumRecvFromFirst19Packets" label="19 packets."/>
-  <group name="NumRecvFromFirst20Packets" label="20 packets."/>
-  <group name="NumRecvFromFirst21Packets" label="21 packets."/>
+</histogram_suffixes>
+
+<histogram_suffixes name="NetConnectivity4PacketReceives" separator=".">
+  <suffix name="NumRecvFromFirst01Packets" label="1 packet."/>
+  <suffix name="NumRecvFromFirst02Packets" label="2 packets."/>
+  <suffix name="NumRecvFromFirst03Packets" label="3 packets."/>
+  <suffix name="NumRecvFromFirst04Packets" label="4 packets."/>
+  <suffix name="NumRecvFromFirst05Packets" label="5 packets."/>
+  <suffix name="NumRecvFromFirst06Packets" label="6 packets."/>
+  <suffix name="NumRecvFromFirst07Packets" label="7 packets."/>
+  <suffix name="NumRecvFromFirst08Packets" label="8 packets."/>
+  <suffix name="NumRecvFromFirst09Packets" label="9 packets."/>
+  <suffix name="NumRecvFromFirst10Packets" label="10 packets."/>
+  <suffix name="NumRecvFromFirst11Packets" label="11 packets."/>
+  <suffix name="NumRecvFromFirst12Packets" label="12 packets."/>
+  <suffix name="NumRecvFromFirst13Packets" label="13 packets."/>
+  <suffix name="NumRecvFromFirst14Packets" label="14 packets."/>
+  <suffix name="NumRecvFromFirst15Packets" label="15 packets."/>
+  <suffix name="NumRecvFromFirst16Packets" label="16 packets."/>
+  <suffix name="NumRecvFromFirst17Packets" label="17 packets."/>
+  <suffix name="NumRecvFromFirst18Packets" label="18 packets."/>
+  <suffix name="NumRecvFromFirst19Packets" label="19 packets."/>
+  <suffix name="NumRecvFromFirst20Packets" label="20 packets."/>
+  <suffix name="NumRecvFromFirst21Packets" label="21 packets."/>
   <affected-histogram name="NetConnectivity4.NonPacedPacket.Sent21"/>
   <affected-histogram name="NetConnectivity4.PacedPacket.Sent21"/>
   <affected-histogram name="NetConnectivity4.StartPacket.Sent21"/>
   <affected-histogram name="NetConnectivity5.NonPacedPacket.Sent21"/>
   <affected-histogram name="NetConnectivity5.PacedPacket.Sent21"/>
   <affected-histogram name="NetConnectivity5.StartPacket.Sent21"/>
-</fieldtrial>
+</histogram_suffixes>
 
-<fieldtrial name="NetConnectivity4PacketRTT" separator=".">
-  <group name="Sent21.GotAPacket"
+<histogram_suffixes name="NetConnectivity4PacketRTT" separator=".">
+  <suffix name="Sent21.GotAPacket"
       label="The histogram shows if we ever got at least one packet in our
              series of 21."/>
-  <group name="Sent21.PacketDelay"
+  <suffix name="Sent21.PacketDelay"
       label="The histogram shows the average inter-arrival time between every
              two consecutive packets we receive in our series of 21
              multiplied by 20 (so this is essentially the time duration
              between the first and the last received packets)."/>
-  <group name="Sent21.PacketsRecv"
+  <suffix name="Sent21.PacketsRecv"
       label="The histogram shows how many packets we receive in our series of
              21."/>
-  <group name="Sent21.RecvNthPacket"
+  <suffix name="Sent21.RecvNthPacket"
       label="Each packet was numbered when it was sent by Google. This
              histogram records, for each packet number, how often we received
              that packet."/>
-  <group name="Sent21.SendToLastRecvDelay"
+  <suffix name="Sent21.SendToLastRecvDelay"
       label="This histogram records the time duration between the client
              sending the request and the receiving of the last packet sent
              from the server, excluding the total pacing time requested by
              the client. Results are only shown if at least two packets are
              received."/>
-  <group name="Sent21.Success.RTT" label="The histogram shows the RTT for the"/>
+  <suffix name="Sent21.Success.RTT"
+      label="The histogram shows the RTT for the"/>
   <affected-histogram name="NetConnectivity4.NonPacedPacket"/>
   <affected-histogram name="NetConnectivity4.PacedPacket"/>
   <affected-histogram name="NetConnectivity4.StartPacket"/>
   <affected-histogram name="NetConnectivity5.NonPacedPacket"/>
   <affected-histogram name="NetConnectivity5.PacedPacket"/>
   <affected-histogram name="NetConnectivity5.StartPacket"/>
-</fieldtrial>
+</histogram_suffixes>
 
-<fieldtrial name="NetConnectivity4PacketRTTSeries" separator=".">
-  <group name="Packet01" label="1st packet."/>
-  <group name="Packet02" label="2nd packet."/>
-  <group name="Packet03" label="3rd packet."/>
-  <group name="Packet10" label="10th packet."/>
-  <group name="Packet20" label="20th packet."/>
+<histogram_suffixes name="NetConnectivity4PacketRTTSeries" separator=".">
+  <suffix name="Packet01" label="1st packet."/>
+  <suffix name="Packet02" label="2nd packet."/>
+  <suffix name="Packet03" label="3rd packet."/>
+  <suffix name="Packet10" label="10th packet."/>
+  <suffix name="Packet20" label="20th packet."/>
   <affected-histogram
       name="NetConnectivity4.NonPacedPacket.Sent21.Success.RTT"/>
   <affected-histogram name="NetConnectivity4.PacedPacket.Sent21.Success.RTT"/>
@@ -42649,15 +47721,15 @@ other types of suffix sets.
       name="NetConnectivity5.NonPacedPacket.Sent21.Success.RTT"/>
   <affected-histogram name="NetConnectivity5.PacedPacket.Sent21.Success.RTT"/>
   <affected-histogram name="NetConnectivity5.StartPacket.Sent21.Success.RTT"/>
-</fieldtrial>
-
-<fieldtrial name="NetConnectivity4PacketsAll" separator=".">
-  <group name="443.100B" label="100 bytes of data is sent on port 443."/>
-  <group name="443.1200B" label="1200 bytes of data is sent on port 443."/>
-  <group name="443.500B" label="500 bytes of data is sent on port 443."/>
-  <group name="80.100B" label="100 bytes of data is sent on port 80."/>
-  <group name="80.1200B" label="1200 bytes of data is sent on port 80."/>
-  <group name="80.500B" label="500 bytes of data is sent on port 80."/>
+</histogram_suffixes>
+
+<histogram_suffixes name="NetConnectivity4PacketsAll" separator=".">
+  <suffix name="443.100B" label="100 bytes of data is sent on port 443."/>
+  <suffix name="443.1200B" label="1200 bytes of data is sent on port 443."/>
+  <suffix name="443.500B" label="500 bytes of data is sent on port 443."/>
+  <suffix name="80.100B" label="100 bytes of data is sent on port 80."/>
+  <suffix name="80.1200B" label="1200 bytes of data is sent on port 80."/>
+  <suffix name="80.500B" label="500 bytes of data is sent on port 80."/>
   <affected-histogram name="NetConnectivity4.NATBind.Sent2.Bind.Failure"/>
   <affected-histogram name="NetConnectivity4.NATBind.Sent2.Bind.Success"/>
   <affected-histogram
@@ -43028,22 +48100,22 @@ other types of suffix sets.
       name="NetConnectivity5.StartPacket.Sent21.Success.RTT.Packet10"/>
   <affected-histogram
       name="NetConnectivity5.StartPacket.Sent21.Success.RTT.Packet20"/>
-</fieldtrial>
+</histogram_suffixes>
 
-<fieldtrial name="NetConnectivity4PacketSizeTest" separator=".">
-  <group name="PacketSizeTest.Connectivity.Failure"
+<histogram_suffixes name="NetConnectivity4PacketSizeTest" separator=".">
+  <suffix name="PacketSizeTest.Connectivity.Failure"
       label="This histogram records the size of the packet size that was not
              received from the server."/>
-  <group name="PacketSizeTest.Connectivity.Success"
+  <suffix name="PacketSizeTest.Connectivity.Success"
       label="This histogram records the size of the packet size that was
              received from the server."/>
   <affected-histogram name="NetConnectivity4"/>
   <affected-histogram name="NetConnectivity5"/>
-</fieldtrial>
+</histogram_suffixes>
 
-<fieldtrial name="NetConnectivity4PacketSizeTestPort" separator=".">
-  <group name="443" label="Packet is sent on port 443."/>
-  <group name="80" label="Packet is sent on port 80."/>
+<histogram_suffixes name="NetConnectivity4PacketSizeTestPort" separator=".">
+  <suffix name="443" label="Packet is sent on port 443."/>
+  <suffix name="80" label="Packet is sent on port 80."/>
   <affected-histogram
       name="NetConnectivity4.PacketSizeTest.Connectivity.Failure"/>
   <affected-histogram
@@ -43052,26 +48124,26 @@ other types of suffix sets.
       name="NetConnectivity5.PacketSizeTest.Connectivity.Failure"/>
   <affected-histogram
       name="NetConnectivity5.PacketSizeTest.Connectivity.Success"/>
-</fieldtrial>
+</histogram_suffixes>
 
-<fieldtrial name="NetConnectivity4SeriesRecv" separator=".">
-  <group name="443.100B" label="100 bytes of data is sent on port 443."/>
-  <group name="443.100B.NoProxy"
+<histogram_suffixes name="NetConnectivity4SeriesRecv" separator=".">
+  <suffix name="443.100B" label="100 bytes of data is sent on port 443."/>
+  <suffix name="443.100B.NoProxy"
       label="100 bytes of data is sent on port 443 with no proxy."/>
-  <group name="443.1200B" label="1200 bytes of data is sent on port 443."/>
-  <group name="443.1200B.NoProxy"
+  <suffix name="443.1200B" label="1200 bytes of data is sent on port 443."/>
+  <suffix name="443.1200B.NoProxy"
       label="1200 bytes of data is sent on port 443 with no proxy."/>
-  <group name="443.500B" label="500 bytes of data is sent on port 443."/>
-  <group name="443.500B.NoProxy"
+  <suffix name="443.500B" label="500 bytes of data is sent on port 443."/>
+  <suffix name="443.500B.NoProxy"
       label="500 bytes of data is sent on port 443 with no proxy."/>
-  <group name="80.100B" label="100 bytes of data is sent on port 80."/>
-  <group name="80.100B.NoProxy"
+  <suffix name="80.100B" label="100 bytes of data is sent on port 80."/>
+  <suffix name="80.100B.NoProxy"
       label="100 bytes of data is sent on port 80 with no proxy."/>
-  <group name="80.1200B" label="1200 bytes of data is sent on port 80."/>
-  <group name="80.1200B.NoProxy"
+  <suffix name="80.1200B" label="1200 bytes of data is sent on port 80."/>
+  <suffix name="80.1200B.NoProxy"
       label="1200 bytes of data is sent on port 80 with no proxy."/>
-  <group name="80.500B" label="500 bytes of data is sent on port 80."/>
-  <group name="80.500B.NoProxy"
+  <suffix name="80.500B" label="500 bytes of data is sent on port 80."/>
+  <suffix name="80.500B.NoProxy"
       label="500 bytes of data is sent on port 80 with no proxy."/>
   <affected-histogram name="NetConnectivity4.NonPacedPacket.First6.SeriesRecv"/>
   <affected-histogram name="NetConnectivity4.PacedPacket.First6.SeriesRecv"/>
@@ -43079,46 +48151,47 @@ other types of suffix sets.
   <affected-histogram name="NetConnectivity5.NonPacedPacket.First6.SeriesRecv"/>
   <affected-histogram name="NetConnectivity5.PacedPacket.First6.SeriesRecv"/>
   <affected-histogram name="NetConnectivity5.StartPacket.First6.SeriesRecv"/>
-</fieldtrial>
+</histogram_suffixes>
 
-<fieldtrial name="NetProxyResolverExecutionTime">
-  <group name="UrlOver2K" label="URL length was over 2K"/>
-  <group name="UrlOver4K" label="URL length was over 4K"/>
-  <group name="UrlOver8K" label="URL length was over 8K"/>
-  <group name="UrlOver128K" label="URL length was over 128K"/>
+<histogram_suffixes name="NetProxyResolverExecutionTime">
+  <suffix name="UrlOver2K" label="URL length was over 2K"/>
+  <suffix name="UrlOver4K" label="URL length was over 4K"/>
+  <suffix name="UrlOver8K" label="URL length was over 8K"/>
+  <suffix name="UrlOver128K" label="URL length was over 128K"/>
   <affected-histogram name="Net.ProxyResolver.ExecutionTime"/>
-</fieldtrial>
-
-<fieldtrial name="NewTabPageProviders" separator=".">
-  <group name="client" label="Suggestions coming from the client."/>
-  <group name="server" label="Suggestions coming from the server."/>
-  <group name="server0" label="Suggestions coming from server source 0."/>
-  <group name="server1" label="Suggestions coming from server source 1."/>
-  <group name="server2" label="Suggestions coming from server source 2."/>
-  <group name="server3" label="Suggestions coming from server source 3."/>
-  <group name="server4" label="Suggestions coming from server source 4."/>
+</histogram_suffixes>
+
+<histogram_suffixes name="NewTabPageProviders" separator=".">
+  <suffix name="client" label="Suggestions coming from the client."/>
+  <suffix name="client0" label="Suggestions coming from the client source 0."/>
+  <suffix name="server" label="Suggestions coming from the server."/>
+  <suffix name="server0" label="Suggestions coming from server source 0."/>
+  <suffix name="server1" label="Suggestions coming from server source 1."/>
+  <suffix name="server2" label="Suggestions coming from server source 2."/>
+  <suffix name="server3" label="Suggestions coming from server source 3."/>
+  <suffix name="server4" label="Suggestions coming from server source 4."/>
   <affected-histogram name="NewTabPage.MostVisited"/>
   <affected-histogram name="NewTabPage.SuggestionsImpression"/>
-</fieldtrial>
-
-<fieldtrial name="OmniboxProviderTime" separator=".">
-  <group name="Bookmark"/>
-  <group name="Builtin"/>
-  <group name="Contact"/>
-  <group name="ExtensionApp"/>
-  <group name="HistoryContents"/>
-  <group name="HistoryQuick"/>
-  <group name="HistoryURL"/>
-  <group name="Keyword"/>
-  <group name="Search"/>
-  <group name="Shortcuts"/>
-  <group name="ZeroSuggest"/>
+</histogram_suffixes>
+
+<histogram_suffixes name="OmniboxProviderTime" separator=".">
+  <suffix name="Bookmark"/>
+  <suffix name="Builtin"/>
+  <suffix name="Contact"/>
+  <suffix name="ExtensionApp"/>
+  <suffix name="HistoryContents"/>
+  <suffix name="HistoryQuick"/>
+  <suffix name="HistoryURL"/>
+  <suffix name="Keyword"/>
+  <suffix name="Search"/>
+  <suffix name="Shortcuts"/>
+  <suffix name="ZeroSuggest"/>
   <affected-histogram name="Omnibox.ProviderTime"/>
-</fieldtrial>
+</histogram_suffixes>
 
-<fieldtrial name="OverlappedReadImpact">
-  <group name="OverlappedReadDisabled" label="Non-blocking reads"/>
-  <group name="OverlappedReadEnabled" label="Default, async reads"/>
+<histogram_suffixes name="OverlappedReadImpact">
+  <suffix name="OverlappedReadDisabled" label="Non-blocking reads"/>
+  <suffix name="OverlappedReadEnabled" label="Default, async reads"/>
   <affected-histogram name="Net.HttpJob.TotalTime"/>
   <affected-histogram name="Net.HttpJob.TotalTimeCached"/>
   <affected-histogram name="Net.HttpJob.TotalTimeCancel"/>
@@ -43130,107 +48203,109 @@ other types of suffix sets.
   <affected-histogram name="PLT.BeginToFinish_LinkLoadStaleOk"/>
   <affected-histogram name="PLT.BeginToFinish_NormalLoad"/>
   <affected-histogram name="PLT.LoadType"/>
-</fieldtrial>
+</histogram_suffixes>
 
-<fieldtrial name="PageLoadType">
-  <group name="HistoryLoad" label="but only for user pressing back or forward"/>
-  <group name="LinkLoad"
+<histogram_suffixes name="PageLoadType">
+  <suffix name="HistoryLoad"
+      label="but only for user pressing back or forward"/>
+  <suffix name="LinkLoad"
       label="deprecated - see LinkLoadReload, LinkLoadNormal,
              LinkLoadStaleOk, LinkLoadCacheOnly; content initiated, commonly
              back to a posted page"/>
-  <group name="LinkLoadCacheOnly"
+  <suffix name="LinkLoadCacheOnly"
       label="content initiated, commonly back to a posted page, where browser
              must ONLY use cache"/>
-  <group name="LinkLoadNormal"
+  <suffix name="LinkLoadNormal"
       label="content initiated, ordinary link traversal or post"/>
-  <group name="LinkLoadReload" label="content initiated, calling reload()"/>
-  <group name="LinkLoadStaleOk"
+  <suffix name="LinkLoadReload" label="content initiated, calling reload()"/>
+  <suffix name="LinkLoadStaleOk"
       label="content initiated, commonly forward or back where stale cached
              data is very acceptable"/>
-  <group name="NormalLoad"
+  <suffix name="NormalLoad"
       label="but only for user entered URL or omnibox search"/>
-  <group name="Reload" label="but only for user pressed reload"/>
-  <group name="UndefLoad"
+  <suffix name="Reload" label="but only for user pressed reload"/>
+  <suffix name="UndefLoad"
       label="should never happen... as it is only for an client-code error
              case which should not exist"/>
   <affected-histogram name="PLT.BeginToFinish"/>
   <affected-histogram name="PLT.BeginToFinishDoc"/>
   <affected-histogram name="PLT.StartToCommit">
-    <with-group name="LinkLoadNormal"/>
-    <with-group name="NormalLoad"/>
+    <with-suffix name="LinkLoadNormal"/>
+    <with-suffix name="NormalLoad"/>
   </affected-histogram>
   <affected-histogram name="PLT.StartToFinish">
-    <with-group name="LinkLoadNormal"/>
-    <with-group name="NormalLoad"/>
+    <with-suffix name="LinkLoadNormal"/>
+    <with-suffix name="NormalLoad"/>
   </affected-histogram>
   <affected-histogram name="Renderer4.BeginToFinish"/>
   <affected-histogram name="Renderer4.BeginToFinishDoc"/>
-</fieldtrial>
-
-<fieldtrial name="PasswordManagerMonitor">
-  <group name="group_1" label="group 1"/>
-  <group name="group_2" label="group 2"/>
-  <group name="group_3" label="group 3"/>
-  <group name="group_4" label="group 4"/>
-  <group name="group_5" label="group 5"/>
-  <group name="group_6" label="group 6"/>
-  <group name="group_7" label="group 7"/>
-  <group name="group_8" label="group 8"/>
-  <group name="group_9" label="group 9"/>
-  <group name="group_10" label="group 10"/>
-  <group name="group_11" label="group 11"/>
-  <group name="group_12" label="group 12"/>
-  <group name="group_13" label="group 13"/>
-  <group name="group_14" label="group 14"/>
-  <group name="group_15" label="group 15"/>
-  <group name="group_16" label="group 16"/>
-  <group name="group_17" label="group 17"/>
-  <group name="group_18" label="group 18"/>
-  <group name="group_19" label="group 19"/>
-  <group name="group_20" label="group 20"/>
-  <group name="" label=""/>
+</histogram_suffixes>
+
+<histogram_suffixes name="PasswordManagerMonitor">
+  <suffix name="group_1" label="group 1"/>
+  <suffix name="group_2" label="group 2"/>
+  <suffix name="group_3" label="group 3"/>
+  <suffix name="group_4" label="group 4"/>
+  <suffix name="group_5" label="group 5"/>
+  <suffix name="group_6" label="group 6"/>
+  <suffix name="group_7" label="group 7"/>
+  <suffix name="group_8" label="group 8"/>
+  <suffix name="group_9" label="group 9"/>
+  <suffix name="group_10" label="group 10"/>
+  <suffix name="group_11" label="group 11"/>
+  <suffix name="group_12" label="group 12"/>
+  <suffix name="group_13" label="group 13"/>
+  <suffix name="group_14" label="group 14"/>
+  <suffix name="group_15" label="group 15"/>
+  <suffix name="group_16" label="group 16"/>
+  <suffix name="group_17" label="group 17"/>
+  <suffix name="group_18" label="group 18"/>
+  <suffix name="group_19" label="group 19"/>
+  <suffix name="group_20" label="group 20"/>
+  <suffix name="" label=""/>
   <affected-histogram name="PasswordManager.ProvisionalSaveFailure"/>
   <affected-histogram
       name="PasswordManager.SavePasswordPromptDisappearedQuickly"/>
   <affected-histogram name="PasswordManager.SavePasswordPromptDisplayed"/>
   <affected-histogram name="PasswordManager.SavePasswordPromptResponse"/>
-</fieldtrial>
-
-<fieldtrial name="PerformanceMonitor" separator=".">
-  <group name="BrowserProcess"/>
-  <group name="RendererProcess"/>
-  <group name="PluginProcess"/>
-  <group name="WorkerProcess"/>
-  <group name="GPUProcess"/>
-  <group name="PPAPIProcess"/>
+</histogram_suffixes>
+
+<histogram_suffixes name="PerformanceMonitor" separator=".">
+  <suffix name="BrowserProcess"/>
+  <suffix name="RendererProcess"/>
+  <suffix name="PluginProcess"/>
+  <suffix name="WorkerProcess"/>
+  <suffix name="GPUProcess"/>
+  <suffix name="PPAPIProcess"/>
   <affected-histogram name="PerformanceMonitor.AverageCPU"/>
   <affected-histogram name="PerformanceMonitor.HighCPU"/>
-</fieldtrial>
-
-<fieldtrial name="PpapiPluginName">
-  <group name="libpepflashplayer.so" label="Flash player on Linux or Cros"/>
-  <group name="libwidevinecdmadapter.so" label="Widevine CDM on Linux or Cros"/>
-  <group name="pepflashplayer.dll" label="Flash player on Windows"/>
-  <group name="PepperFlashPlayer.plugin" label="Flash player on Mac"/>
-  <group name="widevinecdmadapter.dll" label="Widevine CDM on Windows"/>
-  <group name="widevinecdmadapter.plugin" label="Widevine CDM on Mac"/>
+</histogram_suffixes>
+
+<histogram_suffixes name="PpapiPluginName">
+  <suffix name="libpepflashplayer.so" label="Flash player on Linux or Cros"/>
+  <suffix name="libwidevinecdmadapter.so"
+      label="Widevine CDM on Linux or Cros"/>
+  <suffix name="pepflashplayer.dll" label="Flash player on Windows"/>
+  <suffix name="PepperFlashPlayer.plugin" label="Flash player on Mac"/>
+  <suffix name="widevinecdmadapter.dll" label="Widevine CDM on Windows"/>
+  <suffix name="widevinecdmadapter.plugin" label="Widevine CDM on Mac"/>
   <affected-histogram name="Plugin.PpapiBrokerLoadErrorCode"/>
   <affected-histogram name="Plugin.PpapiBrokerLoadResult"/>
   <affected-histogram name="Plugin.PpapiPluginLoadErrorCode"/>
   <affected-histogram name="Plugin.PpapiPluginLoadResult"/>
-</fieldtrial>
+</histogram_suffixes>
 
-<fieldtrial name="PrecacheCellular" separator=".">
-  <group name="Cellular"
+<histogram_suffixes name="PrecacheCellular" separator=".">
+  <suffix name="Cellular"
       label="covers fetches when connected to cellular networks"/>
   <affected-histogram name="Precache.DownloadedNonPrecache"/>
   <affected-histogram name="Precache.Saved"/>
-</fieldtrial>
+</histogram_suffixes>
 
-<fieldtrial name="Prefetch">
-  <group name="ContentPrefetchPrefetchOff"
+<histogram_suffixes name="Prefetch">
+  <suffix name="ContentPrefetchPrefetchOff"
       label="Prefetch is completely disabled."/>
-  <group name="ContentPrefetchPrefetchOn"
+  <suffix name="ContentPrefetchPrefetchOn"
       label="prefetch is enabled but prerender is disabled."/>
   <affected-histogram name="HttpCache.EntryLockWait"/>
   <affected-histogram name="Net.HttpTimeToFirstByte"/>
@@ -43243,16 +48318,16 @@ other types of suffix sets.
   <affected-histogram name="PLT.BeginToFinishDoc_ContentPrefetcherReferrer"/>
   <affected-histogram name="PLT.PerceivedLoadTime"/>
   <affected-histogram name="PLT.PerceivedLoadTime_PrerenderLoad"/>
-</fieldtrial>
+</histogram_suffixes>
 
-<fieldtrial name="Prerender">
-  <group name="PrerenderEnabled" label="prerender is enabled."/>
-  <group name="PrerenderControl" label="prerender is disabled."/>
-  <group name="PrerenderNoUse"
+<histogram_suffixes name="Prerender">
+  <suffix name="PrerenderEnabled" label="prerender is enabled."/>
+  <suffix name="PrerenderControl" label="prerender is disabled."/>
+  <suffix name="PrerenderNoUse"
       label="prerender is enabled, but pages are not swapped in."/>
-  <group name="PrerenderMulti"
+  <suffix name="PrerenderMulti"
       label="prerender is enabled with multiple simultanious prerenders."/>
-  <group name="Prerender5minTTL"
+  <suffix name="Prerender5minTTL"
       label="prerender is enabled, and the TTL is extended to 5 minutes."/>
   <affected-histogram name="HttpCache.EntryLockWait"/>
   <affected-histogram name="Net.HttpTimeToFirstByte"/>
@@ -43289,54 +48364,54 @@ other types of suffix sets.
   <affected-histogram name="Prerender.RendererTimeUntilDisplay"/>
   <affected-histogram name="Prerender.SimulatedLocalBrowsingBaselinePLT"/>
   <affected-histogram name="Prerender.SimulatedLocalBrowsingPLT"/>
-</fieldtrial>
+</histogram_suffixes>
 
-<fieldtrial name="PrerenderHoverType" ordering="prefix">
+<histogram_suffixes name="PrerenderHoverType" ordering="prefix">
   <obsolete>
     deprecated May 10 2012
   </obsolete>
-  <group name="HoverStats_50" label="Hover stats @ threshold 50 ms."/>
-  <group name="HoverStats_75" label="Hover stats @ threshold 75 ms."/>
-  <group name="HoverStats_100" label="Hover stats @ threshold 100 ms."/>
-  <group name="HoverStats_150" label="Hover stats @ threshold 150 ms."/>
-  <group name="HoverStats_200" label="Hover stats @ threshold 200 ms."/>
-  <group name="HoverStats_250" label="Hover stats @ threshold 250 ms."/>
-  <group name="HoverStats_300" label="Hover stats @ threshold 300 ms."/>
-  <group name="HoverStats_400" label="Hover stats @ threshold 400 ms."/>
-  <group name="HoverStats_500" label="Hover stats @ threshold 500 ms."/>
-  <group name="HoverStats_750" label="Hover stats @ threshold 750 ms."/>
-  <group name="HoverStats_1000" label="Hover stats @ threshold 1000 ms."/>
-  <group name="HoverStats_1500" label="Hover stats @ threshold 1500 ms."/>
-  <group name="HoverStats_2000" label="Hover stats @ threshold 2000 ms."/>
-  <group name="HoverStats_3000" label="Hover stats @ threshold 3000 ms."/>
-  <group name="HoverStats_4000" label="Hover stats @ threshold 4000 ms."/>
-  <group name="HoverStats_5000" label="Hover stats @ threshold 5000 ms."/>
+  <suffix name="HoverStats_50" label="Hover stats @ threshold 50 ms."/>
+  <suffix name="HoverStats_75" label="Hover stats @ threshold 75 ms."/>
+  <suffix name="HoverStats_100" label="Hover stats @ threshold 100 ms."/>
+  <suffix name="HoverStats_150" label="Hover stats @ threshold 150 ms."/>
+  <suffix name="HoverStats_200" label="Hover stats @ threshold 200 ms."/>
+  <suffix name="HoverStats_250" label="Hover stats @ threshold 250 ms."/>
+  <suffix name="HoverStats_300" label="Hover stats @ threshold 300 ms."/>
+  <suffix name="HoverStats_400" label="Hover stats @ threshold 400 ms."/>
+  <suffix name="HoverStats_500" label="Hover stats @ threshold 500 ms."/>
+  <suffix name="HoverStats_750" label="Hover stats @ threshold 750 ms."/>
+  <suffix name="HoverStats_1000" label="Hover stats @ threshold 1000 ms."/>
+  <suffix name="HoverStats_1500" label="Hover stats @ threshold 1500 ms."/>
+  <suffix name="HoverStats_2000" label="Hover stats @ threshold 2000 ms."/>
+  <suffix name="HoverStats_3000" label="Hover stats @ threshold 3000 ms."/>
+  <suffix name="HoverStats_4000" label="Hover stats @ threshold 4000 ms."/>
+  <suffix name="HoverStats_5000" label="Hover stats @ threshold 5000 ms."/>
   <affected-histogram name="Prerender.Events"/>
   <affected-histogram name="Prerender.TimeToClick"/>
-</fieldtrial>
-
-<fieldtrial name="PrerenderSource" ordering="prefix">
-  <group name="" label="All prerenders."/>
-  <group name="exp1" label="Likelihood threshold experiment 1."/>
-  <group name="exp2" label="Likelihood threshold experiment 2."/>
-  <group name="exp3" label="Likelihood threshold experiment 3."/>
-  <group name="exp4" label="Likelihood threshold experiment 4."/>
-  <group name="exp5" label="Likelihood threshold experiment 5."/>
-  <group name="exp6" label="Likelihood threshold experiment 6."/>
-  <group name="exp7" label="Likelihood threshold experiment 7."/>
-  <group name="exp8" label="Likelihood threshold experiment 8."/>
-  <group name="exp9" label="Likelihood threshold experiment 9."/>
-  <group name="gws" label="GWS triggered prerender."/>
-  <group name="instant" label="Instant search prerender."/>
-  <group name="localpredictor" label="Local predictor triggered prerender."/>
-  <group name="omnibox" label="Triggered from the omnibox."/>
-  <group name="wash" label="Multiple sources could have triggered."/>
-  <group name="web" label="Link triggered prerender."/>
-  <group name="webcross"
+</histogram_suffixes>
+
+<histogram_suffixes name="PrerenderSource" ordering="prefix">
+  <suffix name="" label="All prerenders."/>
+  <suffix name="exp1" label="Likelihood threshold experiment 1."/>
+  <suffix name="exp2" label="Likelihood threshold experiment 2."/>
+  <suffix name="exp3" label="Likelihood threshold experiment 3."/>
+  <suffix name="exp4" label="Likelihood threshold experiment 4."/>
+  <suffix name="exp5" label="Likelihood threshold experiment 5."/>
+  <suffix name="exp6" label="Likelihood threshold experiment 6."/>
+  <suffix name="exp7" label="Likelihood threshold experiment 7."/>
+  <suffix name="exp8" label="Likelihood threshold experiment 8."/>
+  <suffix name="exp9" label="Likelihood threshold experiment 9."/>
+  <suffix name="gws" label="GWS triggered prerender."/>
+  <suffix name="Instant" label="Instant search prerender."/>
+  <suffix name="localpredictor" label="Local predictor triggered prerender."/>
+  <suffix name="omnibox" label="Triggered from the omnibox."/>
+  <suffix name="wash" label="Multiple sources could have triggered."/>
+  <suffix name="web" label="Link triggered prerender."/>
+  <suffix name="webcross"
       label="Link triggered prerender, rel=prerender, cross domain."/>
-  <group name="websame"
+  <suffix name="websame"
       label="Link triggered prerender, rel=prerender, same domain."/>
-  <group name="webnext" label="Link triggered prerender, rel=next."/>
+  <suffix name="webnext" label="Link triggered prerender, rel=next."/>
   <affected-histogram name="Prerender.AbandonTimeUntilUsed"/>
   <affected-histogram name="Prerender.CookieSendType"/>
   <affected-histogram name="Prerender.CookieStatus"/>
@@ -43374,6 +48449,8 @@ other types of suffix sets.
   <affected-histogram name="Prerender.LocalPredictorEvent_PrerenderMulti"/>
   <affected-histogram name="Prerender.LocalPredictorEvent_PrerenderNoUse"/>
   <affected-histogram name="Prerender.LocalPredictorTimeUntilUsed"/>
+  <affected-histogram name="Prerender.NetworkBytesUsed"/>
+  <affected-histogram name="Prerender.NetworkBytesWasted"/>
   <affected-histogram name="Prerender.PageVisitedStatus"/>
   <affected-histogram name="Prerender.PerceivedPLT"/>
   <affected-histogram name="Prerender.PerceivedPLT_Prerender5minTTL"/>
@@ -43512,36 +48589,72 @@ other types of suffix sets.
   <affected-histogram name="Prerender.TimeBetweenPrerenderRequests"/>
   <affected-histogram name="Prerender.TimeSinceLastRecentVisit"/>
   <affected-histogram name="Prerender.TimeUntilUsed2"/>
-</fieldtrial>
-
-<fieldtrial name="ProfilePictureDownload" separator=".">
-  <group name="Default.OOBE" label="default picture, in OOBE"/>
-  <group name="Default.LoggedIn" label="default picture, after login"/>
-  <group name="Default.Preferences" label="default picture, in Prefs"/>
-  <group name="Failure.OOBE" label="download has failed, in OOBE"/>
-  <group name="Failure.LoggedIn" label="download has failed, after login"/>
-  <group name="Failure.Preferences" label="download has failed, in Prefs"/>
-  <group name="Success.OOBE" label="download was successful, in OOBE"/>
-  <group name="Success.LoggedIn" label="download was successful, after login"/>
-  <group name="Success.Preferences" label="download was successful, in Prefs"/>
+</histogram_suffixes>
+
+<histogram_suffixes name="Profile.AndroidAccountManagementMenu" separator=".">
+  <suffix name="NonGAIA" label="Interaction was not initiated from GAIA"/>
+  <suffix name="GAIASignout"
+      label="GAIA-initiated interaction indicating a service type of Signout"/>
+  <suffix name="GAIASignoutIncognito"
+      label="GAIA-initiated interaction indicating a service type of Signout
+             and go Incogntio"/>
+  <suffix name="GAIAAddSession"
+      label="GAIA-initiated interaction indicating a service type of Add a
+             Session"/>
+  <suffix name="GAIAReAuth"
+      label="GAIA-initiated interaction indicating a service type of
+             Reauthenticate this user"/>
+  <suffix name="GAIADefault"
+      label="GAIA-initiated interaction indicating the default service type"/>
+  <affected-histogram name="Profile.AndroidAccountManagementMenu"/>
+</histogram_suffixes>
+
+<histogram_suffixes name="Profile.DesktopMenu" separator=".">
+  <suffix name="NonGAIA" label="Interaction was not initiated from GAIA"/>
+  <suffix name="GAIASignout"
+      label="GAIA-initiated interaction indicating a service type of Signout"/>
+  <suffix name="GAIAIncognito"
+      label="GAIA-initiated interaction indicating a service type of
+             Incogntio"/>
+  <suffix name="GAIAAddSession"
+      label="GAIA-initiated interaction indicating a service type of Add a
+             Session"/>
+  <suffix name="GAIAReAuth"
+      label="GAIA-initiated interaction indicating a service type of
+             Reauthenticate this user"/>
+  <suffix name="GAIADefault"
+      label="GAIA-initiated interaction indicating the default service type"/>
+  <affected-histogram name="Profile.DesktopMenu"/>
+</histogram_suffixes>
+
+<histogram_suffixes name="ProfilePictureDownload" separator=".">
+  <suffix name="Default.OOBE" label="default picture, in OOBE"/>
+  <suffix name="Default.LoggedIn" label="default picture, after login"/>
+  <suffix name="Default.Preferences" label="default picture, in Prefs"/>
+  <suffix name="Failure.OOBE" label="download has failed, in OOBE"/>
+  <suffix name="Failure.LoggedIn" label="download has failed, after login"/>
+  <suffix name="Failure.Preferences" label="download has failed, in Prefs"/>
+  <suffix name="Success.OOBE" label="download was successful, in OOBE"/>
+  <suffix name="Success.LoggedIn" label="download was successful, after login"/>
+  <suffix name="Success.Preferences" label="download was successful, in Prefs"/>
   <affected-histogram name="UserImage.ProfileDownloadTime"/>
-</fieldtrial>
+</histogram_suffixes>
 
-<fieldtrial name="ProgressiveScan">
-  <group name="FullScan" label="Using WPA_supplicant to scan."/>
-  <group name="33Percent_4MinMax"
+<histogram_suffixes name="ProgressiveScan">
+  <suffix name="FullScan" label="Using WPA_supplicant to scan."/>
+  <suffix name="33Percent_4MinMax"
       label="Progressive scan @ 33%, 4 frequency bins."/>
-  <group name="50Percent_4MinMax"
+  <suffix name="50Percent_4MinMax"
       label="Progressive scan @ 50%, 4 frequency bins."/>
-  <group name="50Percent_8MinMax"
+  <suffix name="50Percent_8MinMax"
       label="Progressive scan @ 50%, 8 frequency bins."/>
-  <group name="100Percent_8MinMax"
+  <suffix name="100Percent_8MinMax"
       label="Progressive scan @ 100%, 8 frequency bins."/>
-  <group name="100Percent_1MinSeen_A"
+  <suffix name="100Percent_1MinSeen_A"
       label="Progressive scan @ all previously seen frequencies (A)."/>
-  <group name="100Percent_1MinSeen_B"
+  <suffix name="100Percent_1MinSeen_B"
       label="Progressive scan @ all previously seen frequencies (B)."/>
-  <group name="100Percent_1Min_4Max"
+  <suffix name="100Percent_1Min_4Max"
       label="Progressive scan @ 100%, minimum 1/maximum 4 frequencies."/>
   <affected-histogram name="Network.Shill.TimeToDrop"/>
   <affected-histogram name="Network.Shill.WiFi.ScanResult"/>
@@ -43549,34 +48662,34 @@ other types of suffix sets.
   <affected-histogram name="Network.Shill.Wifi.TimeToJoin"/>
   <affected-histogram name="Network.Shill.Wifi.TimeToScan"/>
   <affected-histogram name="Network.Shill.Wifi.TimeToScanAndConnect"/>
-</fieldtrial>
+</histogram_suffixes>
 
-<fieldtrial name="ProtectorSettingChange" separator=".">
+<histogram_suffixes name="ProtectorSettingChange" separator=".">
   <obsolete>
     Deprecated 8/2013. No longer tracked.
   </obsolete>
-  <group name="Applied" label="change has been accepted by user"/>
-  <group name="Corrupt" label="possibly hijacked, backup invalid"/>
-  <group name="Discarded" label="change has been reverted by user"/>
-  <group name="Fallback" label="fallback provider used (no backup available)"/>
-  <group name="Hijacked" label="hijacked, with a valid backup"/>
-  <group name="Missing" label="fallback provider missing, added"/>
-  <group name="New" label="(obsolete, was sum of Corrupt+Hijacked)"/>
-  <group name="Restored"
+  <suffix name="Applied" label="change has been accepted by user"/>
+  <suffix name="Corrupt" label="possibly hijacked, backup invalid"/>
+  <suffix name="Discarded" label="change has been reverted by user"/>
+  <suffix name="Fallback" label="fallback provider used (no backup available)"/>
+  <suffix name="Hijacked" label="hijacked, with a valid backup"/>
+  <suffix name="Missing" label="fallback provider missing, added"/>
+  <suffix name="New" label="(obsolete, was sum of Corrupt+Hijacked)"/>
+  <suffix name="Restored"
       label="search provider restored by Protector before showing the bubble"/>
-  <group name="Timeout" label="change has been ignored by user (timed out)"/>
+  <suffix name="Timeout" label="change has been ignored by user (timed out)"/>
   <affected-histogram name="Protector.SearchProvider"/>
   <affected-histogram name="Protector.StartupSettings"/>
-</fieldtrial>
+</histogram_suffixes>
 
-<fieldtrial name="ProxyConnectionImpact">
-  <group name="proxy_connections_16"
+<histogram_suffixes name="ProxyConnectionImpact">
+  <suffix name="proxy_connections_16"
       label="with 16 connections per proxy server"/>
-  <group name="proxy_connections_32"
+  <suffix name="proxy_connections_32"
       label="with 32 connections per proxy server"/>
-  <group name="proxy_connections_64"
+  <suffix name="proxy_connections_64"
       label="with 64 connections per proxy server"/>
-  <group name="proxy_connections_8"
+  <suffix name="proxy_connections_8"
       label="with 8 connections per proxy server"/>
   <affected-histogram name="Net.HttpProxySocketRequestTime"/>
   <affected-histogram name="Net.SocksSocketRequestTime"/>
@@ -43585,147 +48698,151 @@ other types of suffix sets.
   <affected-histogram name="PLT.BeginToFinish_LinkLoadReload"/>
   <affected-histogram name="PLT.BeginToFinish_LinkLoadStaleOk"/>
   <affected-histogram name="PLT.BeginToFinish_NormalLoad"/>
-</fieldtrial>
-
-<fieldtrial name="QueryTimeSuffix" separator=".">
-  <group name="0" label="N = 0"/>
-  <group name="1" label="N = 1"/>
-  <group name="2" label="N = 2"/>
-  <group name="3" label="N = 3"/>
-  <group name="4" label="N = 4"/>
-  <group name="5" label="N = 5"/>
+</histogram_suffixes>
+
+<histogram_suffixes name="QueryTimeSuffix" separator=".">
+  <suffix name="0" label="N = 0"/>
+  <suffix name="1" label="N = 1"/>
+  <suffix name="2" label="N = 2"/>
+  <suffix name="3" label="N = 3"/>
+  <suffix name="4" label="N = 4"/>
+  <suffix name="5" label="N = 5"/>
   <affected-histogram name="Omnibox.QueryTime"/>
-</fieldtrial>
+  <affected-histogram name="ShortcutsProvider.QueryIndexTime"/>
+</histogram_suffixes>
 
-<fieldtrial name="QuicPortSelection" separator="">
-  <group name="SelectPort"
+<histogram_suffixes name="QuicPortSelection" separator="">
+  <owner>rch@chromium.org</owner>
+  <suffix name="SelectPort"
       label="An effort was mode to (try to) consistently connect using the
              same source port for the given server IP/port."/>
-  <group name="RandomPort"
+  <suffix name="RandomPort"
       label="The operating system randomly selected a source port for the
              connection."/>
   <affected-histogram name="Net.QuicSession.Connect"/>
-</fieldtrial>
+</histogram_suffixes>
 
-<fieldtrial name="QuicRttCount" separator="">
-  <group name="ForHTTP" label="Only insecure HTTP connections are counted."/>
-  <group name="ForHTTPS" label="Only secure HTTPS connections are counted."/>
+<histogram_suffixes name="QuicRttCount" separator="">
+  <owner>rch@chromium.org</owner>
+  <suffix name="ForHTTP" label="Only insecure HTTP connections are counted."/>
+  <suffix name="ForHTTPS" label="Only secure HTTPS connections are counted."/>
   <affected-histogram name="Net.QuicSession.ConnectRandomPort"/>
   <affected-histogram name="Net.QuicSession.ConnectSelectPort"/>
   <affected-histogram name="Net.QuicSession.HandshakeRoundTrips"/>
-</fieldtrial>
+</histogram_suffixes>
 
-<fieldtrial name="RemoteProcessWarmStartFast" separator="">
-  <group name="" label="Normal start."/>
-  <group name="Fast" label="Fast start by skipping normal chrome.dll startup."/>
+<histogram_suffixes name="RemoteProcessWarmStartFast" separator="">
+  <suffix name="" label="Normal start."/>
+  <suffix name="Fast"
+      label="Fast start by skipping normal chrome.dll startup."/>
   <affected-histogram name="Startup.WarmStartTimeFromRemoteProcessStart"/>
-</fieldtrial>
+</histogram_suffixes>
 
-<fieldtrial name="RendererEventLatency" separator=".">
-  <group name="Char" label="The Char event occurs on textual keyboard input."/>
-  <group name="ContextMenu" label="For ContextMenu event."/>
-  <group name="GestureDoubleTap"
+<histogram_suffixes name="RendererEventLatency" separator=".">
+  <suffix name="Char" label="The Char event occurs on textual keyboard input."/>
+  <suffix name="ContextMenu" label="For ContextMenu event."/>
+  <suffix name="GestureDoubleTap"
       label="A GestureDoubleTap occurs when the user double taps on a
              touchscreen."/>
-  <group name="GestureFlingCancel"
+  <suffix name="GestureFlingCancel"
       label="A GestureFlingCancel is sent to the renderer to cancel any
              active flings."/>
-  <group name="GestureFlingStart"
+  <suffix name="GestureFlingStart"
       label="A GestureFlingStart is sent when the user quickly flicks on a
              touchscreen."/>
-  <group name="GestureLongPress"
+  <suffix name="GestureLongPress"
       label="A GestureLongPress is sent when the user taps down and holds
              their finger on a touchscreen."/>
-  <group name="GestureLongTap"
+  <suffix name="GestureLongTap"
       label="A GestureLongTap is sent when the user taps down on a
              touchscreen, holds their finger for a while, then releases."/>
-  <group name="GesturePinchBegin"
+  <suffix name="GesturePinchBegin"
       label="A GesturePinchBegin is sent when a user starts a pinch zoom
              motion on a touchscreen."/>
-  <group name="GesturePinchEnd"
+  <suffix name="GesturePinchEnd"
       label="A GesturePinchEnd is sent when the user releases their fingers
              from the touchscreen after performing a pinch zoom motion."/>
-  <group name="GesturePinchUpdate"
+  <suffix name="GesturePinchUpdate"
       label="GesturePinchUpdate events are sent while the user is performing
              a pinch zoom motion on a touch screen. GesturePinchUpdate events
              are sent as the user changes the distance between their fingers."/>
-  <group name="GestureScrollBegin"
+  <suffix name="GestureScrollBegin"
       label="A GestureScrollBegin is sent at the beginning of a gesture
              scroll on a touchscreen."/>
-  <group name="GestureScrollEnd"
+  <suffix name="GestureScrollEnd"
       label="A GestureScrollEnd is sent when the user releases their finger
              after a gesture scroll on a touchscreen."/>
-  <group name="GestureScrollUpdate"
+  <suffix name="GestureScrollUpdate"
       label="GestureScrollUpdate events are sent as the user drags their
              finger along the touchscreen during a gesture scroll."/>
-  <group name="GestureScrollUpdateWithoutPropagation"
+  <suffix name="GestureScrollUpdateWithoutPropagation"
       label="GestureScrollUpdateWithoutPropagation events are scroll updates
              that shouldn't bubble, generated by a gesture fling."/>
-  <group name="GestureShowPress"
+  <suffix name="GestureShowPress"
       label="A GestureShowPress event is sent when the user presses down on
              the touchscreen but before a GestureTapDown."/>
-  <group name="GestureTap"
+  <suffix name="GestureTap"
       label="A GestureTap is sent when the user presses down and releases on
              a touchscreen."/>
-  <group name="GestureTapUnconfirmed"
+  <suffix name="GestureTapUnconfirmed"
       label="A GestureTapUnconfirmed is sent when the user taps the
              touchscreen but, due to a delay, the GestureTap isn't sent yet."/>
-  <group name="GestureTapCancel"
+  <suffix name="GestureTapCancel"
       label="A GestureTapCancel is sent to cancel a pending GestureTap event.
              For example, if the user taps down but drags their finger
              instead of releasing it."/>
-  <group name="GestureTapDown"
+  <suffix name="GestureTapDown"
       label="A GestureTapDown is sent when the user presses on the
              touchscreen in what could potentially be a full GestureTap
              event."/>
-  <group name="GestureTwoFingerTap"
+  <suffix name="GestureTwoFingerTap"
       label="A GestureTwoFingerTap is sent when the user presses down a
              releases on a touchscreen with two fingers."/>
-  <group name="KeyDown"
+  <suffix name="KeyDown"
       label="A KeyDown event is sent when a keyboard key is pressed down."/>
-  <group name="KeyUp"
+  <suffix name="KeyUp"
       label="A KeyUp event is sent when a depressed keyboard key is released."/>
-  <group name="MouseDown"
+  <suffix name="MouseDown"
       label="A MouseDown event is sent when the user click down a mouse
              button."/>
-  <group name="MouseEnter"
+  <suffix name="MouseEnter"
       label="A MouseEnter event is sent when the mouse cursor enters the
              renderer area."/>
-  <group name="MouseLeave"
+  <suffix name="MouseLeave"
       label="A MouseLeave event is sent when the mouse cursor leaves the
              renderer area."/>
-  <group name="MouseMove"
+  <suffix name="MouseMove"
       label="A MouseMove event is sent when the mouse cursor moves within the
              renderer area."/>
-  <group name="MouseUp"
+  <suffix name="MouseUp"
       label="A MouseUp event is sent when a depressed mouse button is
              released."/>
-  <group name="MouseWheel"
+  <suffix name="MouseWheel"
       label="A MouseWheel event is sent when the user scrolls using the mouse
              wheel within the renderer area."/>
-  <group name="RawKeyDown"
+  <suffix name="RawKeyDown"
       label="A RawKeyDown event is a wrapper around a native key event."/>
-  <group name="TouchCancel"
+  <suffix name="TouchCancel"
       label="A TouchCancel is used to cancel an existing touch point. For
              example, if the user drags a finger outside the bounds of the
              renderer."/>
-  <group name="TouchEnd"
+  <suffix name="TouchEnd"
       label="A TouchEnd is send when the user lifts a finger from the
              touchscreen."/>
-  <group name="TouchMove"
+  <suffix name="TouchMove"
       label="A TouchMove is sent when the user moves a finger along the
              touchscreen."/>
-  <group name="TouchStart"
+  <suffix name="TouchStart"
       label="A TouchStart is sent when the user first touches a finger to the
              touchscreen."/>
-  <group name="Undefined" label="For unknown or undefined events."/>
+  <suffix name="Undefined" label="For unknown or undefined events."/>
   <affected-histogram name="Event.Latency.Renderer"/>
   <affected-histogram name="Event.Latency.Renderer2"/>
-</fieldtrial>
+</histogram_suffixes>
 
-<fieldtrial name="SBInterstitial">
-  <group name="V1" label="original interstitial"/>
-  <group name="V2" label="version 2 (new interstitial)"/>
+<histogram_suffixes name="SBInterstitial">
+  <suffix name="V1" label="original interstitial"/>
+  <suffix name="V2" label="version 2 (new interstitial)"/>
   <affected-histogram name="SB2.InterstitialAction"/>
   <affected-histogram name="SB2.MalwareInterstitialTimeClosed"/>
   <affected-histogram name="SB2.MalwareInterstitialTimeDiagnostic"/>
@@ -43733,17 +48850,18 @@ other types of suffix sets.
   <affected-histogram name="SB2.MalwareInterstitialTimePrivacyPolicy"/>
   <affected-histogram name="SB2.MalwareInterstitialTimeProceed"/>
   <affected-histogram name="SB2.MalwareInterstitialTimeTakeMeBack"/>
-</fieldtrial>
+</histogram_suffixes>
 
-<fieldtrial name="ShowAppListWarmStartFast" separator="">
-  <group name="" label="Normal start."/>
-  <group name="Fast" label="Fast start by skipping normal chrome.dll startup."/>
+<histogram_suffixes name="ShowAppListWarmStartFast" separator="">
+  <suffix name="" label="Normal start."/>
+  <suffix name="Fast"
+      label="Fast start by skipping normal chrome.dll startup."/>
   <affected-histogram name="Startup.ShowAppListWarmStart"/>
-</fieldtrial>
+</histogram_suffixes>
 
-<fieldtrial name="SideloadWipeout">
-  <group name="Enabled" label="Sideload Wipeout Active."/>
-  <group name="Disabled" label="Control group."/>
+<histogram_suffixes name="SideloadWipeout">
+  <suffix name="Enabled" label="Sideload Wipeout Active."/>
+  <suffix name="Disabled" label="Control group."/>
   <affected-histogram name="DisabledExtension.ExtensionWipedStatus"/>
   <affected-histogram name="DisabledExtension.SideloadWipeoutCount"/>
   <affected-histogram name="DisabledExtension.SideloadWipeoutNeeded"/>
@@ -43751,37 +48869,66 @@ other types of suffix sets.
   <affected-histogram name="Extensions.ExternalExtensionEvent"/>
   <affected-histogram name="Extensions.InstallSource"/>
   <affected-histogram name="Extensions.UpdateSource"/>
-</fieldtrial>
-
-<fieldtrial name="SocketType">
-  <group name="HTTPProxy" label="HTTP proxy socket"/>
-  <group name="SOCK" label="SOCKS socket"/>
-  <group name="SSL" label="(Obsolete, SSL socket)"/>
-  <group name="SSL2" label="SSL2 socket"/>
-  <group name="SSLForProxies"
+</histogram_suffixes>
+
+<histogram_suffixes name="Signin.Actions" separator=".">
+  <suffix name="AllAccessPointActions"/>
+  <suffix name="AndroidAccountConsistencyFirstRunActions"
+      label="Signin Flow shown on android after Account Consistency flag was
+             enabled."/>
+  <suffix name="AppLauncherActions"/>
+  <suffix name="ExtensionInstallBubbleActions"/>
+  <suffix name="MenuActions"/>
+  <suffix name="NTPLinkActions"/>
+  <suffix name="OneClickActions"/>
+  <suffix name="SettingsActions"/>
+  <suffix name="StartPageActions"/>
+  <suffix name="UnknownActions"/>
+  <suffix name="WebstoreInstallActions"/>
+  <affected-histogram name="Signin"/>
+</histogram_suffixes>
+
+<histogram_suffixes name="Signin.Reconciler" separator=".">
+  <suffix name="FirstRun"
+      label="First execution of the reconciler after the profile was loaded
+             or the new_profile_management flag was toggled."/>
+  <suffix name="SubsequentRun"
+      label="Execution of the reconciler triggered by some other change of
+             state."/>
+  <affected-histogram name="Signin.Reconciler.AddedToChrome"/>
+  <affected-histogram name="Signin.Reconciler.AddedToCookieJar"/>
+  <affected-histogram name="Signin.Reconciler.DifferentPrimaryAccounts"/>
+</histogram_suffixes>
+
+<histogram_suffixes name="SocketType">
+  <suffix name="HTTPProxy" label="HTTP proxy socket"/>
+  <suffix name="SOCK" label="SOCKS socket"/>
+  <suffix name="SSL" label="(Obsolete, SSL socket)"/>
+  <suffix name="SSL2" label="SSL2 socket"/>
+  <suffix name="SSLForProxies"
       label="SSLClientSocket wrapping the TCPClient socket eventually used
              for connection to a proxy"/>
-  <group name="SSLforHTTPSProxy"
+  <suffix name="SSLforHTTPSProxy"
       label="SSLClientSocket wrapping the TCPClient socket eventually used
              for connection to an HTTPS proxy"/>
-  <group name="TCP" label="plain, no proxy, no SSL socket"/>
-  <group name="TCPforHTTPProxy"
+  <suffix name="TCP" label="plain, no proxy, no SSL socket"/>
+  <suffix name="TCPforHTTPProxy"
       label="TCPClientSocket eventually used for connection to an HTTP proxy"/>
-  <group name="TCPforHTTPSProxy"
+  <suffix name="TCPforHTTPSProxy"
       label="TCPClientSocket eventually used for connection to an HTTPS proxy"/>
-  <group name="TCPforSOCKS"
+  <suffix name="TCPforSOCKS"
       label="TCPClientSocket eventually used for connection to a SOCKS proxy"/>
   <affected-histogram name="Net.SocketIdleTimeBeforeNextUse_ReusedSocket"/>
   <affected-histogram name="Net.SocketIdleTimeBeforeNextUse_UnusedSocket"/>
   <affected-histogram name="Net.SocketInitErrorCodes"/>
   <affected-histogram name="Net.SocketRequestTime"/>
   <affected-histogram name="Net.SocketType"/>
-</fieldtrial>
+</histogram_suffixes>
 
-<fieldtrial name="SpdyImpact">
-  <group name="npn_with_http"
+<histogram_suffixes name="SpdyImpact">
+  <suffix name="npn_with_http"
       label="with NPN negotiated but using HTTP instead of SPDY"/>
-  <group name="npn_with_spdy" label="with NPN negotiated and using SPDY"/>
+  <suffix name="npn_with_spdy" label="with NPN negotiated and using SPDY"/>
   <affected-histogram name="Net.Transaction_Connected"/>
   <affected-histogram name="Net.Transaction_Connected_New"/>
   <affected-histogram name="Net.Transaction_Connected_New_b"/>
@@ -43793,127 +48940,146 @@ other types of suffix sets.
   <affected-histogram name="PLT.StartToCommit_NormalLoad"/>
   <affected-histogram name="PLT.StartToFinish_LinkLoadNormal"/>
   <affected-histogram name="PLT.StartToFinish_NormalLoad"/>
-</fieldtrial>
+</histogram_suffixes>
 
-<fieldtrial name="SpdySettingsCwnd" separator="">
-  <group name="10K" label="where at least 10KB was transferred."/>
-  <group name="25K" label="where at least 25KB was transferred."/>
-  <group name="50K" label="where at least 50KB was transferred."/>
-  <group name="100K" label="where at least 100KB was transferred."/>
+<histogram_suffixes name="SpdySettingsCwnd" separator="">
+  <suffix name="10K" label="where at least 10KB was transferred."/>
+  <suffix name="25K" label="where at least 25KB was transferred."/>
+  <suffix name="50K" label="where at least 50KB was transferred."/>
+  <suffix name="100K" label="where at least 100KB was transferred."/>
   <affected-histogram name="Net.SpdySettingsCwnd"/>
-</fieldtrial>
-
-<fieldtrial name="SqliteDatabases" separator=".">
-  <group name="Activity" label="Activity"/>
-  <group name="AppCache" label="AppCache"/>
-  <group name="Cookie" label="Cookie"/>
-  <group name="DatabaseTracker" label="DatabaseTracker"/>
-  <group name="DomainBoundCerts" label="DomainBoundCerts"/>
-  <group name="DomStorageDatabase" label="DomStorageDatabase"/>
-  <group name="History" label="History"/>
-  <group name="Predictor" label="Predictor"/>
-  <group name="Quota" label="Quota"/>
-  <group name="Shortcuts" label="Shortcuts"/>
-  <group name="SyncDirectory" label="SyncDirectory"/>
-  <group name="Text" label="Text (obsolete 7/24/13)"/>
-  <group name="Thumbnail" label="Thumbnail"/>
-  <group name="TopSites" label="TopSites"/>
-  <group name="Web" label="Web"/>
+</histogram_suffixes>
+
+<histogram_suffixes name="SqliteDatabases" separator=".">
+  <suffix name="Activity" label="Activity"/>
+  <suffix name="AppCache" label="AppCache"/>
+  <suffix name="BookmarkImages" label="BookmarkImages"/>
+  <suffix name="Cookie" label="Cookie"/>
+  <suffix name="DatabaseTracker" label="DatabaseTracker"/>
+  <suffix name="DomainBoundCerts" label="DomainBoundCerts"/>
+  <suffix name="DomStorageDatabase" label="DomStorageDatabase"/>
+  <suffix name="History" label="History"/>
+  <suffix name="Predictor" label="Predictor"/>
+  <suffix name="Quota" label="Quota"/>
+  <suffix name="Shortcuts" label="Shortcuts"/>
+  <suffix name="SyncDirectory" label="SyncDirectory"/>
+  <suffix name="Text" label="Text (obsolete 7/24/13)"/>
+  <suffix name="Thumbnail" label="Thumbnail"/>
+  <suffix name="TopSites" label="TopSites"/>
+  <suffix name="Web" label="Web"/>
   <affected-histogram name="Sqlite.Error"/>
   <affected-histogram name="Sqlite.SizeKB"/>
   <affected-histogram name="Sqlite.Version"/>
-</fieldtrial>
+</histogram_suffixes>
 
-<fieldtrial name="SSLFalseStart">
-  <group name="FalseStart_enabled"/>
-  <group name="FalseStart_disabled"/>
+<histogram_suffixes name="SSLFalseStart">
+  <suffix name="FalseStart_enabled"/>
+  <suffix name="FalseStart_disabled"/>
   <affected-histogram name="Net.SSL_Connection_Latency"/>
   <affected-histogram name="PLT.BeginToFinish_LinkLoadNormal"/>
   <affected-histogram name="PLT.BeginToFinish_NormalLoad"/>
-</fieldtrial>
+</histogram_suffixes>
 
-<fieldtrial name="SSLResumption">
-  <group name="Resume_Handshake" label="Session Resumption"/>
-  <group name="Full_Handshake" label="Full"/>
+<histogram_suffixes name="SSLResumption">
+  <suffix name="Resume_Handshake" label="Session Resumption"/>
+  <suffix name="Full_Handshake" label="Full"/>
   <affected-histogram name="Net.SSL_Connection_Latency"/>
   <affected-histogram name="Net.SSL_Connection_Latency_Google"/>
-</fieldtrial>
-
-<fieldtrial name="SyzygyStartupTime">
-  <group name="PreReadEnabled"/>
-  <group name="PreReadDisabled"/>
-  <group name="XP_PreReadEnabled"/>
-  <group name="XP_PreReadDisabled"/>
-  <group name="PreRead_0"/>
-  <group name="PreRead_5"/>
-  <group name="PreRead_10"/>
-  <group name="PreRead_15"/>
-  <group name="PreRead_20"/>
-  <group name="PreRead_25"/>
-  <group name="PreRead_30"/>
-  <group name="PreRead_35"/>
-  <group name="PreRead_40"/>
-  <group name="PreRead_45"/>
-  <group name="PreRead_50"/>
-  <group name="PreRead_55"/>
-  <group name="PreRead_60"/>
-  <group name="PreRead_65"/>
-  <group name="PreRead_70"/>
-  <group name="PreRead_75"/>
-  <group name="PreRead_80"/>
-  <group name="PreRead_85"/>
-  <group name="PreRead_90"/>
-  <group name="PreRead_95"/>
-  <group name="PreRead_100"/>
-  <group name="XP_PreRead_0"/>
-  <group name="XP_PreRead_5"/>
-  <group name="XP_PreRead_10"/>
-  <group name="XP_PreRead_15"/>
-  <group name="XP_PreRead_20"/>
-  <group name="XP_PreRead_25"/>
-  <group name="XP_PreRead_30"/>
-  <group name="XP_PreRead_35"/>
-  <group name="XP_PreRead_40"/>
-  <group name="XP_PreRead_45"/>
-  <group name="XP_PreRead_50"/>
-  <group name="XP_PreRead_55"/>
-  <group name="XP_PreRead_60"/>
-  <group name="XP_PreRead_65"/>
-  <group name="XP_PreRead_70"/>
-  <group name="XP_PreRead_75"/>
-  <group name="XP_PreRead_80"/>
-  <group name="XP_PreRead_85"/>
-  <group name="XP_PreRead_90"/>
-  <group name="XP_PreRead_95"/>
-  <group name="XP_PreRead_100"/>
+</histogram_suffixes>
+
+<histogram_suffixes name="StartupTimeBombAlarm" separator=".">
+  <suffix name="ThreadNowDuration" label="Duration is in thread CPU time."/>
+  <suffix name="TimeDuration" label="Duration is in clock time."/>
+  <suffix name="TimeTicksDuration" label="Duration is in TimeTicks time."/>
+  <affected-histogram name="StartupTimeBomb.Alarm"/>
+</histogram_suffixes>
+
+<histogram_suffixes name="SyzygyStartupTime">
+  <suffix name="PreReadEnabled"/>
+  <suffix name="PreReadDisabled"/>
+  <suffix name="XP_PreReadEnabled"/>
+  <suffix name="XP_PreReadDisabled"/>
+  <suffix name="PreRead_0"/>
+  <suffix name="PreRead_5"/>
+  <suffix name="PreRead_10"/>
+  <suffix name="PreRead_15"/>
+  <suffix name="PreRead_20"/>
+  <suffix name="PreRead_25"/>
+  <suffix name="PreRead_30"/>
+  <suffix name="PreRead_35"/>
+  <suffix name="PreRead_40"/>
+  <suffix name="PreRead_45"/>
+  <suffix name="PreRead_50"/>
+  <suffix name="PreRead_55"/>
+  <suffix name="PreRead_60"/>
+  <suffix name="PreRead_65"/>
+  <suffix name="PreRead_70"/>
+  <suffix name="PreRead_75"/>
+  <suffix name="PreRead_80"/>
+  <suffix name="PreRead_85"/>
+  <suffix name="PreRead_90"/>
+  <suffix name="PreRead_95"/>
+  <suffix name="PreRead_100"/>
+  <suffix name="XP_PreRead_0"/>
+  <suffix name="XP_PreRead_5"/>
+  <suffix name="XP_PreRead_10"/>
+  <suffix name="XP_PreRead_15"/>
+  <suffix name="XP_PreRead_20"/>
+  <suffix name="XP_PreRead_25"/>
+  <suffix name="XP_PreRead_30"/>
+  <suffix name="XP_PreRead_35"/>
+  <suffix name="XP_PreRead_40"/>
+  <suffix name="XP_PreRead_45"/>
+  <suffix name="XP_PreRead_50"/>
+  <suffix name="XP_PreRead_55"/>
+  <suffix name="XP_PreRead_60"/>
+  <suffix name="XP_PreRead_65"/>
+  <suffix name="XP_PreRead_70"/>
+  <suffix name="XP_PreRead_75"/>
+  <suffix name="XP_PreRead_80"/>
+  <suffix name="XP_PreRead_85"/>
+  <suffix name="XP_PreRead_90"/>
+  <suffix name="XP_PreRead_95"/>
+  <suffix name="XP_PreRead_100"/>
   <affected-histogram name="Startup.BrowserMessageLoopStartTime"/>
   <affected-histogram name="Startup.BrowserOpenTabs"/>
-</fieldtrial>
-
-<fieldtrial name="Tps65090Fets" separator=".">
-  <group name="Fet1" label="FET1 on tps65090 (register 0xf)"/>
-  <group name="Fet2" label="FET2 on tps65090 (register 0x10)"/>
-  <group name="Fet3" label="FET3 on tps65090 (register 0x11)"/>
-  <group name="Fet4" label="FET4 on tps65090 (register 0x12)"/>
-  <group name="Fet5" label="FET5 on tps65090 (register 0x13)"/>
-  <group name="Fet6" label="FET6 on tps65090 (register 0x14)"/>
-  <group name="Fet7" label="FET7 on tps65090 (register 0x15)"/>
+</histogram_suffixes>
+
+<histogram_suffixes name="Tps65090Fets" separator=".">
+  <suffix name="Fet1" label="FET1 on tps65090 (register 0xf)"/>
+  <suffix name="Fet2" label="FET2 on tps65090 (register 0x10)"/>
+  <suffix name="Fet3" label="FET3 on tps65090 (register 0x11)"/>
+  <suffix name="Fet4" label="FET4 on tps65090 (register 0x12)"/>
+  <suffix name="Fet5" label="FET5 on tps65090 (register 0x13)"/>
+  <suffix name="Fet6" label="FET6 on tps65090 (register 0x14)"/>
+  <suffix name="Fet7" label="FET7 on tps65090 (register 0x15)"/>
   <affected-histogram name="Platform.Tps65090Retries"/>
-</fieldtrial>
+</histogram_suffixes>
 
-<fieldtrial name="TrackedSplitPreferences" separator=".">
-  <group name="extensions.settings" label="Extension IDs dictionary"/>
+<histogram_suffixes name="TrackedSplitPreferences" separator=".">
+  <suffix name="extensions.settings" label="Extension IDs dictionary"/>
   <affected-histogram name="Settings.TrackedSplitPreferenceChanged"/>
-</fieldtrial>
-
-<fieldtrial name="WebStoreLinkExperiment">
-  <group name="Disabled" label="Neither extra webstore link is visible"/>
-  <group name="FooterLink" label="Link in bottom right of footer"/>
-  <group name="PlusIcon" label="Plus icon in apps page"/>
+</histogram_suffixes>
+
+<histogram_suffixes name="WebFontFamily">
+  <suffix name="roboto" label="Roboto font"/>
+  <suffix name="opensans" label="Open Sans font"/>
+  <suffix name="others" label="Fonts other than Roboto and Open Sans"/>
+  <affected-histogram name="WebFont.DiskCache.EntryAge.Evict"/>
+  <affected-histogram name="WebFont.DiskCache.EntryAge.Hit"/>
+  <affected-histogram name="WebFont.DiskCache.ReuseCount.Evict"/>
+  <affected-histogram name="WebFont.DiskCache.ReuseCount.Hit"/>
+  <affected-histogram name="WebFont.DiskCacheHit"/>
+</histogram_suffixes>
+
+<histogram_suffixes name="WebStoreLinkExperiment">
+  <suffix name="Disabled" label="Neither extra webstore link is visible"/>
+  <suffix name="FooterLink" label="Link in bottom right of footer"/>
+  <suffix name="PlusIcon" label="Plus icon in apps page"/>
   <affected-histogram name="Extensions.AppLaunch"/>
   <affected-histogram name="NewTabPage.DefaultPageType"/>
-</fieldtrial>
+</histogram_suffixes>
 
-</fieldtrials>
+</histogram_suffixes_list>
 
 </histogram-configuration>