Make histogram_suffixes separators and enum labels required.

tools/metrics/histograms/histograms.xml

Index: tools/metrics/histograms/histograms.xml
diff --git a/tools/metrics/histograms/histograms.xml b/tools/metrics/histograms/histograms.xml
index f454f6d977559f57c49c27f4dbb9421e964cdfb4..5b9ef9c0fd360d56465f6c043fd22474529b6e6f 100644
--- a/tools/metrics/histograms/histograms.xml
+++ b/tools/metrics/histograms/histograms.xml
@@ -84185,7 +84185,7 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
 
 <histogram_suffixes_list>
 
-<histogram_suffixes name="AccountInvestigationReportingType">
+<histogram_suffixes name="AccountInvestigationReportingType" separator="_">
   <suffix name="OnChange"
       label="Driven from a change in signin status or change in content area
              GAIA accounts."/>
@@ -84198,7 +84198,7 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   <affected-histogram name="Signin.IsShared"/>
 </histogram_suffixes>
 
-<histogram_suffixes name="ActiveNetworkState">
+<histogram_suffixes name="ActiveNetworkState" separator="_">
   <suffix name="Offline"
       label="network manager thinks that the active network is offline"/>
   <suffix name="Online"
@@ -84228,7 +84228,7 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
       name="PasswordManager.AffiliationDummyData.RequestSuccess"/>
 </histogram_suffixes>
 
-<histogram_suffixes name="AlternateProtocol">
+<histogram_suffixes name="AlternateProtocol" separator="_">
   <suffix name="AlternateProtocol_spdy"
       label="with alternate protocol available but http is used"/>
   <suffix name="AlternateProtocol_http"
@@ -84259,7 +84259,7 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   <affected-histogram name="Arc.boot_progress"/>
 </histogram_suffixes>
 
-<histogram_suffixes name="AndroidCrashUploadTypes">
+<histogram_suffixes name="AndroidCrashUploadTypes" separator="_">
   <suffix name="Browser" label="Measures browser crash uploads."/>
   <suffix name="GPU" label="Measures GPU crash uploads."/>
   <suffix name="Other" label="Measures other crash uploads."/>
@@ -84295,7 +84295,7 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   <affected-histogram name="Bluetooth.Web.Android"/>
 </histogram_suffixes>
 
-<histogram_suffixes name="AndroidGetAccountsTypes">
+<histogram_suffixes name="AndroidGetAccountsTypes" separator="_">
   <suffix name="AccountManager" label="Using Android AccountManager API"/>
   <suffix name="GoogleAuthUtil" label="Using GoogleAuthUtil API"/>
   <affected-histogram name="Signin.AndroidGetAccountsTime"/>
@@ -84329,14 +84329,14 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   <affected-histogram name="Startup.AppListFirstPaintWarmStart"/>
 </histogram_suffixes>
 
-<histogram_suffixes name="AsyncDNSPref">
+<histogram_suffixes name="AsyncDNSPref" separator="_">
   <suffix name="Disabled"/>
   <suffix name="Enabled"/>
   <affected-histogram name="AsyncDNS.PrefDefaultSource"/>
   <affected-histogram name="AsyncDNS.PrefSource"/>
 </histogram_suffixes>
 
-<histogram_suffixes name="AsyncSlowStart">
+<histogram_suffixes name="AsyncSlowStart" separator="_">
   <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"/>
@@ -84344,7 +84344,7 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   <affected-histogram name="Renderer4.StartToFinish"/>
 </histogram_suffixes>
 
-<histogram_suffixes name="AttemptResultCode">
+<histogram_suffixes name="AttemptResultCode" separator="_">
   <obsolete>
     Deprecated 2016/03. The async set-as-default experiments are finished.
   </obsolete>
@@ -84424,7 +84424,7 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   <affected-histogram name="Autofill.SaveCreditCardPrompt.Upload"/>
 </histogram_suffixes>
 
-<histogram_suffixes name="AutofillServerExperiments">
+<histogram_suffixes name="AutofillServerExperiments" separator="_">
   <obsolete>
     Deprecated as of at least 2013. Current autofill experiments rely on Finch
     rather than a custom experimentation setup.
@@ -84615,7 +84615,7 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   <affected-histogram name="Blink.Canvas.ToDataURL"/>
 </histogram_suffixes>
 
-<histogram_suffixes name="BlinkGCReason">
+<histogram_suffixes name="BlinkGCReason" separator="_">
   <suffix name="IdleGC" label="Idle GC"/>
   <suffix name="PreciseGC" label="Precise GC"/>
   <suffix name="ConservativeGC" label="Conservative GC"/>
@@ -84755,7 +84755,7 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   <affected-histogram name="SimpleCache.WriteResult2"/>
 </histogram_suffixes>
 
-<histogram_suffixes name="CacheListSize">
+<histogram_suffixes name="CacheListSize" separator="_">
   <obsolete>
     Experiments no longer active.
   </obsolete>
@@ -84779,7 +84779,7 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   <affected-histogram name="PLT.BeginToFinish_Reload"/>
 </histogram_suffixes>
 
-<histogram_suffixes name="CacheSensitivityAnalysis">
+<histogram_suffixes name="CacheSensitivityAnalysis" separator="_">
   <obsolete>
     Experiments no longer active.
   </obsolete>
@@ -84805,7 +84805,7 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   <affected-histogram name="PLT.CommitToFirstPaint_CacheSensitivity"/>
 </histogram_suffixes>
 
-<histogram_suffixes name="CacheSensitivityHistograms">
+<histogram_suffixes name="CacheSensitivityHistograms" separator="_">
   <suffix name="CacheSensitivity" label="Cache Sensivitiy Analysis"/>
   <affected-histogram name="PLT.BeginToFinish"/>
   <affected-histogram name="PLT.BeginToFinishDoc"/>
@@ -84813,7 +84813,7 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   <affected-histogram name="PLT.CommitToFirstPaint"/>
 </histogram_suffixes>
 
-<histogram_suffixes name="CacheSensitivityHistograms">
+<histogram_suffixes name="CacheSensitivityHistograms" separator="_">
   <suffix name="CacheSensitivity" label="Cache Sensivitiy Analysis"/>
   <affected-histogram name="PLT.BeginToFinish"/>
   <affected-histogram name="PLT.BeginToFinishDoc"/>
@@ -84821,7 +84821,7 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   <affected-histogram name="PLT.CommitToFirstPaint"/>
 </histogram_suffixes>
 
-<histogram_suffixes name="CacheThrottle">
+<histogram_suffixes name="CacheThrottle" separator="_">
   <suffix name="CacheThrottle_On" label="Throttling payload requests."/>
   <suffix name="CacheThrottle_Off" label="Control group."/>
   <affected-histogram name="DiskCache.TotalIOTime"/>
@@ -84836,7 +84836,7 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   <affected-histogram name="PLT.BeginToFinish_Reload"/>
 </histogram_suffixes>
 
-<histogram_suffixes name="CanvasRequestedImageMimeTypeFunctions">
+<histogram_suffixes name="CanvasRequestedImageMimeTypeFunctions" separator="_">
   <suffix name="toDataURL" label="Image formats passed to canvas.toDataURL"/>
   <suffix name="toBlobCallback"
       label="Image formats passed to canvas.toBlob (callback)"/>
@@ -84938,7 +84938,7 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   <affected-histogram name="MobileStartup.ToolbarInflationTime"/>
 </histogram_suffixes>
 
-<histogram_suffixes name="ChromeOS.MachineIdRegen.AgeSeconds">
+<histogram_suffixes name="ChromeOS.MachineIdRegen.AgeSeconds" separator="_">
   <suffix name="Network"/>
   <suffix name="Periodic"/>
   <suffix name="Unknown"/>
@@ -85084,7 +85084,7 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
       name="Scheduling.Renderer.BeginMainFrameStartToCommitDuration"/>
 </histogram_suffixes>
 
-<histogram_suffixes name="ConnCountImpact">
+<histogram_suffixes name="ConnCountImpact" separator="_">
   <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"/>
@@ -85122,7 +85122,7 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   <affected-histogram name="ConnectivityDiagnostics.TimeTaken"/>
 </histogram_suffixes>
 
-<histogram_suffixes name="ConnnectBackupJobs">
+<histogram_suffixes name="ConnnectBackupJobs" separator="_">
   <suffix name="ConnectBackupJobsEnabled"/>
   <suffix name="ConnectBackupJobsDisabled"/>
   <affected-histogram name="Net.PreconnectUtilization"/>
@@ -85262,7 +85262,7 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   <affected-histogram name="Search.ContextualSearchQuickActions.ResultsSeen"/>
 </histogram_suffixes>
 
-<histogram_suffixes name="CreditCardScanSuccess">
+<histogram_suffixes name="CreditCardScanSuccess" separator="_">
   <suffix name="Completed" label="Credit card scan completed."/>
   <suffix name="Cancelled" label="Credit card scan was cancelled."/>
   <affected-histogram name="Autofill.ScanCreditCard.Duration"/>
@@ -85275,7 +85275,7 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   <affected-histogram name="CrosFirstRun.TimeSpentOnStep"/>
 </histogram_suffixes>
 
-<histogram_suffixes name="CurrentTabState">
+<histogram_suffixes name="CurrentTabState" separator="_">
   <suffix name="Initial" label="For a tab that is just being created."/>
   <suffix name="Active"
       label="For an active tab which is shown foreground in a browser window."/>
@@ -85288,7 +85288,7 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   <affected-histogram name="Tabs.StateTransfer.Time"/>
 </histogram_suffixes>
 
-<histogram_suffixes name="DataReductionProxy">
+<histogram_suffixes name="DataReductionProxy" separator="_">
   <obsolete>
     Deprecated 9/2016.
   </obsolete>
@@ -85340,7 +85340,7 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   <affected-histogram name="DataReductionProxy.LoFi.Accuracy"/>
 </histogram_suffixes>
 
-<histogram_suffixes name="DataReductionProxy.MimeType">
+<histogram_suffixes name="DataReductionProxy.MimeType" separator="_">
   <suffix name="Application" label="Application mime-type"/>
   <suffix name="Unknown"
       label="Deprecated. Moved to UnknownMime in M46. Unknown mime-type"/>
@@ -85770,7 +85770,7 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   <affected-histogram name="DataUse.BackgroundToFirstDownstream"/>
 </histogram_suffixes>
 
-<histogram_suffixes name="DefaultAppsExperiment">
+<histogram_suffixes name="DefaultAppsExperiment" separator="_">
   <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"/>
@@ -85783,7 +85783,7 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   <affected-histogram name="Profile.AppCount"/>
 </histogram_suffixes>
 
-<histogram_suffixes name="DefaultPinnedApps">
+<histogram_suffixes name="DefaultPinnedApps" separator="_">
   <obsolete>
     Deprecated as of 12/2013. Default pinned apps trial is finished.
   </obsolete>
@@ -85793,7 +85793,8 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   <affected-histogram name="Cros.ClickOnShelf"/>
 </histogram_suffixes>
 
-<histogram_suffixes name="DeprecatedPrerenderSource" ordering="prefix">
+<histogram_suffixes name="DeprecatedPrerenderSource" separator="_"
+    ordering="prefix">
   <obsolete>
     Deprecated August 2016
   </obsolete>
@@ -86100,7 +86101,8 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   <affected-histogram name="Platform.DiskUsage.LeastUsedAccountDays"/>
 </histogram_suffixes>
 
-<histogram_suffixes name="DNS.HostCache.UpdateStale.AddressListDeltaType">
+<histogram_suffixes name="DNS.HostCache.UpdateStale.AddressListDeltaType"
+    separator="_">
   <suffix name="Identical" label="Same addresses, in the same order."/>
   <suffix name="Reordered" label="Same addresses, in a different order."/>
   <suffix name="Overlap" label="Some same addreses, some different."/>
@@ -86109,7 +86111,7 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   <affected-histogram name="DNS.HostCache.UpdateStale.NetworkChanges"/>
 </histogram_suffixes>
 
-<histogram_suffixes name="DnsImpact2">
+<histogram_suffixes name="DnsImpact2" separator="_">
   <suffix name="disabled_prefetch"
       label="DNS pre-resolving is disabled in these clients"/>
   <suffix name="disabled_prefetch_4_connections"
@@ -86144,7 +86146,7 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   </affected-histogram>
 </histogram_suffixes>
 
-<histogram_suffixes name="DnsImpact3">
+<histogram_suffixes name="DnsImpact3" separator="_">
   <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"/>
@@ -86169,7 +86171,7 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   </affected-histogram>
 </histogram_suffixes>
 
-<histogram_suffixes name="DnsParallelism">
+<histogram_suffixes name="DnsParallelism" separator="_">
   <suffix name="parallel_10"
       label="with only 10 concurrent resolutions done in parallel"/>
   <suffix name="parallel_14"
@@ -86267,7 +86269,7 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   <affected-histogram name="Media.EME.Widevine.TimeTo"/>
 </histogram_suffixes>
 
-<histogram_suffixes name="EngagementScoreBuckets">
+<histogram_suffixes name="EngagementScoreBuckets" separator="_">
   <owner>calamity@chromium.org</owner>
   <suffix name="0"/>
   <suffix name="10"/>
@@ -86470,7 +86472,7 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   <affected-histogram name="FileBrowser.Load"/>
 </histogram_suffixes>
 
-<histogram_suffixes name="FirstPacketSplit">
+<histogram_suffixes name="FirstPacketSplit" separator="_">
   <suffix name="first_packet_intact"
       label="with GET/POST headers often using only 1 packet"/>
   <suffix name="first_packet_split"
@@ -86507,7 +86509,7 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   <affected-histogram name="Notifications.Freedesktop.Capabilities"/>
 </histogram_suffixes>
 
-<histogram_suffixes name="FromGWS">
+<histogram_suffixes name="FromGWS" separator="_">
   <suffix name="FromGWS"
       label="Only page loads that are a result of a navigation from a web
              search are considered."/>
@@ -86538,7 +86540,7 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   <affected-histogram name="Geolocation.SettingsDialog.SuppressEvent"/>
 </histogram_suffixes>
 
-<histogram_suffixes name="Gesture">
+<histogram_suffixes name="Gesture" separator="_">
   <suffix name="Wheel"
       label="Measure the size of scroller that users wheel scroll"/>
   <suffix name="Touch"
@@ -86546,13 +86548,13 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   <affected-histogram name="Event.Scroll.ScrollerSize.OnScroll"/>
 </histogram_suffixes>
 
-<histogram_suffixes name="GLApisWithErrorReporting">
+<histogram_suffixes name="GLApisWithErrorReporting" separator="_">
   <suffix name="TexImage2D" label="All GL APIs that allocate a 2D texture."/>
   <suffix name="TexImage3D" label="All GL APIs that allocate a 3D texture."/>
   <affected-histogram name="GPU.Error"/>
 </histogram_suffixes>
 
-<histogram_suffixes name="GlobalSdch">
+<histogram_suffixes name="GlobalSdch" separator="_">
   <suffix name="global_disable_sdch" label="with SDCH completely disabled"/>
   <suffix name="global_enable_sdch"
       label="with SDCH support for applicable sites"/>
@@ -86587,7 +86589,7 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   <affected-histogram name="Renderer4.StartToFinish"/>
 </histogram_suffixes>
 
-<histogram_suffixes name="GoogleSearchVariations">
+<histogram_suffixes name="GoogleSearchVariations" separator="_">
   <owner>kmadhusu@chromium.org</owner>
   <suffix name="_PrerenderDisabled"
       label="Counts number of Google searches from various access points in
@@ -86624,7 +86626,7 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   <affected-histogram name="Memory.Experimental.Gpu2"/>
 </histogram_suffixes>
 
-<histogram_suffixes name="GWSChromeJointExperiment">
+<histogram_suffixes name="GWSChromeJointExperiment" separator="_">
   <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.
@@ -86817,7 +86819,7 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   <affected-histogram name="Net.HttpJob.PrefilterBytesRead"/>
 </histogram_suffixes>
 
-<histogram_suffixes name="HttpPipeliningCompatibility">
+<histogram_suffixes name="HttpPipeliningCompatibility" separator="_">
   <suffix name="disable_test" label="Do nothing"/>
   <suffix name="enable_test" label="Test connection for HTTP pipelining"/>
   <affected-histogram name="NetConnectivity.Pipeline.0.NetworkError"/>
@@ -86844,7 +86846,7 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   <affected-histogram name="NetConnectivity.Pipeline.Success"/>
 </histogram_suffixes>
 
-<histogram_suffixes name="IdleSktToImpact">
+<histogram_suffixes name="IdleSktToImpact" separator="_">
   <suffix name="idle_timeout_5"
       label="with 5-second unused idle socket timeout"/>
   <suffix name="idle_timeout_10"
@@ -86959,13 +86961,13 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   <affected-histogram name="Installer.TotalMBsDownloadedFrom"/>
 </histogram_suffixes>
 
-<histogram_suffixes name="Instant">
+<histogram_suffixes name="Instant" separator="_">
   <suffix name="Extended" label="Suggestions + Results"/>
   <suffix name="Instant" label="Results"/>
   <affected-histogram name="Instant.SessionsStorageNamespace"/>
 </histogram_suffixes>
 
-<histogram_suffixes name="InstantExtended_QuerytoQuery">
+<histogram_suffixes name="InstantExtended_QuerytoQuery" separator="_">
   <obsolete>
     All relevant histograms have been marked as obsolete as of Sep 2016.
   </obsolete>
@@ -86980,7 +86982,7 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   <affected-histogram name="InstantExtended.PercentageMatchV2_URLtoURL"/>
 </histogram_suffixes>
 
-<histogram_suffixes name="InstantSearchClicks">
+<histogram_suffixes name="InstantSearchClicks" separator="_">
   <obsolete>
     Deprecated as of 7/2015.
   </obsolete>
@@ -87029,7 +87031,7 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   <affected-histogram name="Startup.FirstCommitNavigationTime2"/>
 </histogram_suffixes>
 
-<histogram_suffixes name="InterProcessTimeTicksConversionType">
+<histogram_suffixes name="InterProcessTimeTicksConversionType" separator="_">
   <owner>ppi@chromium.org</owner>
   <suffix name="BrowserToRenderer"/>
   <suffix name="RendererToBrowser"/>
@@ -87091,7 +87093,7 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   <affected-histogram name="WebRTC.SystemSendPacketDuration"/>
 </histogram_suffixes>
 
-<histogram_suffixes name="IPv6_Probe">
+<histogram_suffixes name="IPv6_Probe" separator="_">
   <suffix name="IPv6_probe_skipped"
       label="with IPv6 not probed, and default OS settings used"/>
   <suffix name="IPv6_probe_done"
@@ -87134,7 +87136,7 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   <affected-histogram name="JSDialogs.CharacterCount"/>
 </histogram_suffixes>
 
-<histogram_suffixes name="LateBindingExperiment">
+<histogram_suffixes name="LateBindingExperiment" separator="_">
   <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"/>
@@ -87271,7 +87273,7 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   <affected-histogram name="LevelDBEnv.TimeUntilSuccessFor"/>
 </histogram_suffixes>
 
-<histogram_suffixes name="LevelDBOpenResults">
+<histogram_suffixes name="LevelDBOpenResults" separator="_">
   <suffix name="DomDistillerStore" label="Databases for DomDistillerStore"/>
   <suffix name="GCMKeyStore" label="Databases for GCMKeyStore"/>
   <suffix name="ImageManager" label="Databases for ImageManager"/>
@@ -87339,7 +87341,7 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   <affected-histogram name="Renderer4.LockExistingCachedImage"/>
 </histogram_suffixes>
 
-<histogram_suffixes name="LowMemoryMargin">
+<histogram_suffixes name="LowMemoryMargin" separator="_">
   <suffix name="default" label="Low memory margin set to the system default"/>
   <suffix name="off" label="Low memory notification disabled"/>
   <suffix name="0mb" label="Low memory margin set to 0MB"/>
@@ -87357,7 +87359,7 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   <affected-histogram name="Tabs.SadTab.KillCreated"/>
 </histogram_suffixes>
 
-<histogram_suffixes name="MacAudioInputVariants">
+<histogram_suffixes name="MacAudioInputVariants" separator="_">
   <suffix name="HighLatency"
       label="Measures the standard Mac audio driver (i.e. not low-latency)."/>
   <affected-histogram name="Media.Audio.InputStartupSuccessMac"/>
@@ -87700,7 +87702,7 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   <affected-histogram name="WebRTC.Stun.SuccessPercent"/>
 </histogram_suffixes>
 
-<histogram_suffixes name="NavigationCharacteristic">
+<histogram_suffixes name="NavigationCharacteristic" separator="_">
   <suffix name="ExistingRenderer_BeforeUnloadDiscounted"
       label="Navigation reused an existing renderer process. Time spent in
              beforeunload subtracted."/>
@@ -87724,7 +87726,7 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   <affected-histogram name="Navigation.TimeToURLJobStart"/>
 </histogram_suffixes>
 
-<histogram_suffixes name="NavigationPreloadEnabled">
+<histogram_suffixes name="NavigationPreloadEnabled" separator="_">
   <affected-histogram
       name="ServiceWorker.ActivatedWorkerPreparationForMainFrame.Time"/>
   <affected-histogram
@@ -87734,7 +87736,7 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
       name="ServiceWorker.ActivatedWorkerPreparationForMainFrame.Type"/>
 </histogram_suffixes>
 
-<histogram_suffixes name="NavigationPreloadOrWorkerFirst">
+<histogram_suffixes name="NavigationPreloadOrWorkerFirst" separator="_">
   <suffix name="SWStartFirst"
       label="The service worker finished preparing before the navigation
              preload response arrived."/>
@@ -89052,7 +89054,7 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   <affected-histogram name="Net.HttpProxy.ConnectLatency.Secure"/>
 </histogram_suffixes>
 
-<histogram_suffixes name="NetProxyResolverExecutionTime">
+<histogram_suffixes name="NetProxyResolverExecutionTime" separator="_">
   <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"/>
@@ -89172,7 +89174,7 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   <affected-histogram name="NewTabPage.TilesReceivedTime"/>
 </histogram_suffixes>
 
-<histogram_suffixes name="NextTabState">
+<histogram_suffixes name="NextTabState" separator="_">
   <suffix name="Active"
       label="For a tab active which is shown foreground in a browser window."/>
   <suffix name="Inactive"
@@ -89186,7 +89188,7 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   <affected-histogram name="Tabs.StateTransfer.Time_Inactive"/>
 </histogram_suffixes>
 
-<histogram_suffixes name="NotificationDisplayExperiment">
+<histogram_suffixes name="NotificationDisplayExperiment" separator="_">
   <suffix name="Fullscreen.Shown"
       label="A notification sent by a fullscreen app or webpage that is
              displayed."/>
@@ -89612,7 +89614,7 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   <affected-histogram name="UMA.Histograms.Activity"/>
 </histogram_suffixes>
 
-<histogram_suffixes name="OverlappedReadImpact">
+<histogram_suffixes name="OverlappedReadImpact" separator="_">
   <obsolete>
     Experiments no longer active.
   </obsolete>
@@ -90346,7 +90348,7 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
       name="PageLoad.Experimental.AbortTiming.Reload.BeforeCommit"/>
 </histogram_suffixes>
 
-<histogram_suffixes name="PageLoadType">
+<histogram_suffixes name="PageLoadType" separator="_">
   <suffix name="HistoryLoad"
       label="but only for user pressing back or forward"/>
   <suffix name="LinkLoad"
@@ -90382,7 +90384,7 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   <affected-histogram name="Renderer4.BeginToFinishDoc"/>
 </histogram_suffixes>
 
-<histogram_suffixes name="PageLoadType">
+<histogram_suffixes name="PageLoadType" separator="_">
   <suffix name="HistoryLoad"
       label="but only for user pressing back or forward"/>
   <suffix name="LinkLoad"
@@ -90471,7 +90473,7 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   <affected-histogram name="PasswordManager.TotalAccounts"/>
 </histogram_suffixes>
 
-<histogram_suffixes name="PasswordManagerMonitor">
+<histogram_suffixes name="PasswordManagerMonitor" separator="_">
   <obsolete>
     Deprecated as of 03/2016.
   </obsolete>
@@ -90788,7 +90790,7 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   <affected-histogram name="NaCl.Perf.Size.PNaClTranslatedNexe"/>
 </histogram_suffixes>
 
-<histogram_suffixes name="PositionVariants">
+<histogram_suffixes name="PositionVariants" separator="_">
   <suffix name="0_0" label="Only snippets on position 0"/>
   <suffix name="1_2" label="Only snippets on position 1-2"/>
   <suffix name="3_4" label="Only snippets on position 3-4"/>
@@ -90803,7 +90805,7 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   <affected-histogram name="NewTabPage.Snippets.CardShownScoreNew"/>
 </histogram_suffixes>
 
-<histogram_suffixes name="PpapiPluginName">
+<histogram_suffixes name="PpapiPluginName" separator="_">
   <suffix name="libpepflashplayer.so" label="Flash player on Linux or Cros"/>
   <suffix name="libwidevinecdmadapter.so"
       label="Widevine CDM on Linux or Cros"/>
@@ -90835,7 +90837,7 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   <affected-histogram name="Settings.JsonDataWriteCount"/>
 </histogram_suffixes>
 
-<histogram_suffixes name="Prefetch">
+<histogram_suffixes name="Prefetch" separator="_">
   <suffix name="ContentPrefetchPrefetchOff"
       label="Prefetch is completely disabled."/>
   <suffix name="ContentPrefetchPrefetchOn"
@@ -90853,7 +90855,7 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   <affected-histogram name="PLT.PerceivedLoadTime_PrerenderLoad"/>
 </histogram_suffixes>
 
-<histogram_suffixes name="Prerender">
+<histogram_suffixes name="Prerender" separator="_">
   <obsolete>
     Deprecated August 2016
   </obsolete>
@@ -90905,7 +90907,7 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   <affected-histogram name="Prerender.SimulatedLocalBrowsingPLT"/>
 </histogram_suffixes>
 
-<histogram_suffixes name="PrerenderHoverType" ordering="prefix">
+<histogram_suffixes name="PrerenderHoverType" separator="_" ordering="prefix">
   <obsolete>
     deprecated May 10 2012
   </obsolete>
@@ -90929,7 +90931,7 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   <affected-histogram name="Prerender.TimeToClick"/>
 </histogram_suffixes>
 
-<histogram_suffixes name="PrerenderModeType">
+<histogram_suffixes name="PrerenderModeType" separator="_">
   <obsolete>
     Deprecated August 2016
   </obsolete>
@@ -90974,7 +90976,7 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   <affected-histogram name="Prerender.PrefetchTTFCP.Warm.NoStore"/>
 </histogram_suffixes>
 
-<histogram_suffixes name="PrerenderSource" ordering="prefix">
+<histogram_suffixes name="PrerenderSource" separator="_" ordering="prefix">
   <suffix name="" label="All prerenders."/>
   <suffix name="gws" label="GWS triggered prerender."/>
   <suffix name="externalrequest" label="Externally triggered prerender."/>
@@ -91116,7 +91118,7 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   <affected-histogram name="UserImage.ProfileDownloadTime"/>
 </histogram_suffixes>
 
-<histogram_suffixes name="ProgressiveScan">
+<histogram_suffixes name="ProgressiveScan" separator="_">
   <suffix name="FullScan" label="Using WPA_supplicant to scan."/>
   <suffix name="33Percent_4MinMax"
       label="Progressive scan @ 33%, 4 frequency bins."/>
@@ -91158,7 +91160,7 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   <affected-histogram name="Protector.StartupSettings"/>
 </histogram_suffixes>
 
-<histogram_suffixes name="ProxyConnectionImpact">
+<histogram_suffixes name="ProxyConnectionImpact" separator="_">
   <suffix name="proxy_connections_16"
       label="with 16 connections per proxy server"/>
   <suffix name="proxy_connections_32"
@@ -91489,7 +91491,7 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   <affected-histogram name="Media.EME.RequestMediaKeySystemAccess"/>
 </histogram_suffixes>
 
-<histogram_suffixes name="RequestThrottlerTypes">
+<histogram_suffixes name="RequestThrottlerTypes" separator="_">
   <suffix name="SuggestionFetcher"
       label="Fetcher for content suggestions on mobile NTP">
     <obsolete>
@@ -91538,7 +91540,8 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   <affected-histogram name="ResourcePrefetchPredictor.NetworkType"/>
 </histogram_suffixes>
 
-<histogram_suffixes name="ResourcePrefetchPredictorPLTNetworkTypes">
+<histogram_suffixes name="ResourcePrefetchPredictorPLTNetworkTypes"
+    separator="_">
   <obsolete>
     Deprecated September 2016. No longer recorded.
   </obsolete>
@@ -91580,7 +91583,8 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   <affected-histogram name="ResourcePrefetchPredictor.PLT.Prefetched"/>
 </histogram_suffixes>
 
-<histogram_suffixes name="ResourcePrefetchPredictorPredictedStatsVariedMax">
+<histogram_suffixes name="ResourcePrefetchPredictorPredictedStatsVariedMax"
+    separator="_">
   <obsolete>
     Deprecated September 2016. No longer recorded.
   </obsolete>
@@ -91624,7 +91628,8 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
       name="ResourcePrefetchPredictor.Url.PredictedPrefetchMisses_PercentOfTotalPrefetched"/>
 </histogram_suffixes>
 
-<histogram_suffixes name="ResourcePrefetchPredictorPredictedStatTypes">
+<histogram_suffixes name="ResourcePrefetchPredictorPredictedStatTypes"
+    separator="_">
   <obsolete>
     Deprecated September 2016. No longer recorded.
   </obsolete>
@@ -91646,7 +91651,7 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
       name="ResourcePrefetchPredictor.Url.PredictedPrefetchMisses"/>
 </histogram_suffixes>
 
-<histogram_suffixes name="ResourceSchedulerClientBreakDown">
+<histogram_suffixes name="ResourceSchedulerClientBreakDown" separator="_">
   <obsolete>
     Deprecated 1/2016
   </obsolete>
@@ -91856,7 +91861,7 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   <affected-histogram name="SB2.ResourceTypes2"/>
 </histogram_suffixes>
 
-<histogram_suffixes name="SBInterstitial">
+<histogram_suffixes name="SBInterstitial" separator="_">
   <obsolete>
     deprecated November 10 2012 crrev.com/167056
   </obsolete>
@@ -91889,7 +91894,7 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   <affected-histogram name="WebRTC.Video.Screenshare.Layer1"/>
 </histogram_suffixes>
 
-<histogram_suffixes name="ScrollUpdateHandledThread">
+<histogram_suffixes name="ScrollUpdateHandledThread" separator="_">
   <suffix name="Main" label="ScrollUpdate handled on main thread"/>
   <suffix name="Impl" label="ScrollUpdate handled on impl thread"/>
   <affected-histogram
@@ -92006,7 +92011,7 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   <affected-histogram name="ServiceWorker.ContextRequestHandlerStatus"/>
 </histogram_suffixes>
 
-<histogram_suffixes name="ServiceWorker.EventType">
+<histogram_suffixes name="ServiceWorker.EventType" separator="_">
   <suffix name="ACTIVATE" label="ACTIVATE"/>
   <suffix name="INSTALL" label="INSTALL"/>
   <suffix name="SYNC" label="SYNC"/>
@@ -92050,7 +92055,7 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   <affected-histogram name="ServiceWorker.StartWorker.Time_NewProcess"/>
 </histogram_suffixes>
 
-<histogram_suffixes name="ServiceWorker.FailureStreak">
+<histogram_suffixes name="ServiceWorker.FailureStreak" separator="_">
   <suffix name="1" label="Failed one time."/>
   <suffix name="2" label="Failed two times."/>
   <suffix name="3" label="Failed three times."/>
@@ -92067,7 +92072,7 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   <affected-histogram name="ServiceWorker.NavigationHintPrecision"/>
 </histogram_suffixes>
 
-<histogram_suffixes name="ServiceWorker.NavigationHintLatency">
+<histogram_suffixes name="ServiceWorker.NavigationHintLatency" separator="_">
   <suffix name="IsRunningNavigationHintTask"
       label="Starting a service worker for a navigation hint.">
     <obsolete>
@@ -92078,13 +92083,13 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   <affected-histogram name="Event.Latency.TouchToScrollUpdateSwapBegin"/>
 </histogram_suffixes>
 
-<histogram_suffixes name="ServiceWorker.ShutdownStatus">
+<histogram_suffixes name="ServiceWorker.ShutdownStatus" separator="_">
   <suffix name="InShutdown" label="Browser shutdown started."/>
   <suffix name="NotInShutdown" label="Browser shutdown has not started."/>
   <affected-histogram name="ServiceWorker.ActivateEventStatus"/>
 </histogram_suffixes>
 
-<histogram_suffixes name="ServiceWorker.StartSituation">
+<histogram_suffixes name="ServiceWorker.StartSituation" separator="_">
   <suffix name="DuringStartup"
       label="The worker started up during browser startup."/>
   <suffix name="NewProcess"
@@ -92104,7 +92109,7 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   <affected-histogram name="ServiceWorker.StartWorker.Time"/>
 </histogram_suffixes>
 
-<histogram_suffixes name="ServiceWorker.WorkerPreparationMode">
+<histogram_suffixes name="ServiceWorker.WorkerPreparationMode" separator="_">
   <suffix name="StartWorkerDuringStartup"
       label="Started a worker during browser startup."/>
   <suffix name="StartWorkerNewProcess"
@@ -92202,7 +92207,7 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   <affected-histogram name="ServiceWorker.EventDispatchingDelay_UNKNOWN"/>
 </histogram_suffixes>
 
-<histogram_suffixes name="SessionRestoreTabCountMemoryPressure">
+<histogram_suffixes name="SessionRestoreTabCountMemoryPressure" separator="_">
   <suffix name="MemoryPressure"
       label="Total tabs involved in session restore that encountered memory
              pressure."/>
@@ -92224,7 +92229,7 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   <affected-histogram name="SessionRestore.TabCount"/>
 </histogram_suffixes>
 
-<histogram_suffixes name="SessionRestoreTabCounts">
+<histogram_suffixes name="SessionRestoreTabCounts" separator="_">
   <suffix name="1" label="1 tab present"/>
   <suffix name="2" label="2 tabs present"/>
   <suffix name="3" label="3 tabs present"/>
@@ -92253,7 +92258,7 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   <affected-histogram name="SessionRestore.ForegroundTabFirstPaint3"/>
 </histogram_suffixes>
 
-<histogram_suffixes name="SettingsResetPromptSettingType">
+<histogram_suffixes name="SettingsResetPromptSettingType" separator="_">
   <suffix name="DefaultSearch" label="Reset state for default search engine."/>
   <suffix name="StartupUrls" label="Reset state for startup URLs."/>
   <suffix name="Homepage" label="Reset state for homepage."/>
@@ -92285,7 +92290,7 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   <affected-histogram name="Startup.ShowAppListWarmStart"/>
 </histogram_suffixes>
 
-<histogram_suffixes name="SideloadWipeout">
+<histogram_suffixes name="SideloadWipeout" separator="_">
   <suffix name="Enabled" label="Sideload Wipeout Active."/>
   <suffix name="Disabled" label="Control group."/>
   <affected-histogram name="DisabledExtension.ExtensionWipedStatus"/>
@@ -92339,7 +92344,7 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   <affected-histogram name="Signin.Reconciler.Duration"/>
 </histogram_suffixes>
 
-<histogram_suffixes name="SimpleCacheWithOrWithoutIndex">
+<histogram_suffixes name="SimpleCacheWithOrWithoutIndex" separator="_">
   <suffix name="WithIndex" label="The Simple Cache index was loaded."/>
   <suffix name="WithoutIndex"
       label="The Simple Cache index was not yet loaded."/>
@@ -92366,7 +92371,7 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   <affected-histogram name="Net.SSLProtocolErrorReason"/>
 </histogram_suffixes>
 
-<histogram_suffixes name="SocketType">
+<histogram_suffixes name="SocketType" separator="_">
   <obsolete>
     Deprecated as of 03/2015.
   </obsolete>
@@ -92394,7 +92399,7 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   <affected-histogram name="Net.SocketType"/>
 </histogram_suffixes>
 
-<histogram_suffixes name="SoftwareReporterEngine">
+<histogram_suffixes name="SoftwareReporterEngine" separator="_">
   <suffix name="Original"/>
   <suffix name="Experimental"/>
   <affected-histogram name="SoftwareReporter.FoundUwSReadError"/>
@@ -92410,7 +92415,7 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   <affected-histogram name="SoftwareReporter.Step"/>
 </histogram_suffixes>
 
-<histogram_suffixes name="SpdyCwnd">
+<histogram_suffixes name="SpdyCwnd" separator="_">
   <obsolete>
     Deprecated as of 07/2014.
   </obsolete>
@@ -92429,7 +92434,7 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   <affected-histogram name="PLT.StartToFinish_NormalLoad"/>
 </histogram_suffixes>
 
-<histogram_suffixes name="SpdyImpact">
+<histogram_suffixes name="SpdyImpact" separator="_">
   <suffix name="npn_with_http"
       label="with NPN negotiated but using HTTP instead of SPDY"/>
   <suffix name="npn_with_spdy" label="with NPN negotiated and using SPDY"/>
@@ -92504,7 +92509,7 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   <affected-histogram name="Sqlite.Vfs"/>
 </histogram_suffixes>
 
-<histogram_suffixes name="SSLFalseStart">
+<histogram_suffixes name="SSLFalseStart" separator="_">
   <obsolete>
     Removed 2011-06-01.
   </obsolete>
@@ -92516,7 +92521,7 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   <affected-histogram name="PLT.BeginToFinish_NormalLoad"/>
 </histogram_suffixes>
 
-<histogram_suffixes name="StartupProfilingAbandonState">
+<histogram_suffixes name="StartupProfilingAbandonState" separator="_">
   <suffix name="NoPaint" label="Abandoned before first paint."/>
   <suffix name="NoLoad" label="Abandoned before first main frame load."/>
   <affected-histogram name="Startup.FirstWebContents.FinishReason"/>
@@ -92579,7 +92584,7 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   <affected-histogram name="Startup.FirstWebContents.MainNavigationStart"/>
 </histogram_suffixes>
 
-<histogram_suffixes name="StartWorkerExistingProcess">
+<histogram_suffixes name="StartWorkerExistingProcess" separator="_">
   <suffix name="StartWorkerExistingProcess"
       label="The worker started up in an existing process"/>
   <affected-histogram name="ServiceWorker.NavigationPreload.ConcurrentTime"/>
@@ -92696,7 +92701,7 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   <affected-histogram name="Sync.ModelTypeCount"/>
 </histogram_suffixes>
 
-<histogram_suffixes name="SyzygyStartupTime">
+<histogram_suffixes name="SyzygyStartupTime" separator="_">
   <obsolete>
     No longer logged.
   </obsolete>
@@ -92757,7 +92762,7 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   <affected-histogram name="Tab.NewTabOnload"/>
 </histogram_suffixes>
 
-<histogram_suffixes name="Tabs.SwitchLatency">
+<histogram_suffixes name="Tabs.SwitchLatency" separator="_">
   <suffix name="Perceived"
       label="The time it takes to show something on the screen after the user
              selects a tab. This might be a fake snapshot or it might just be
@@ -92949,7 +92954,7 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
       name="Net.QuicSession.LocallyTimedOutWithOpenStreams.TimeSinceLastReceived"/>
 </histogram_suffixes>
 
-<histogram_suffixes name="UnPackConsumer">
+<histogram_suffixes name="UnPackConsumer" separator="_">
   <suffix name="ChromeArchivePatch"
       label="compressed patch: chrome_patch.packed.7z holding
              chrome_patch.diff (small)."/>
@@ -93061,7 +93066,7 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   <affected-histogram name="WebApk.ShellApkVersion"/>
 </histogram_suffixes>
 
-<histogram_suffixes name="WebFontFamily">
+<histogram_suffixes name="WebFontFamily" separator="_">
   <suffix name="roboto" label="Roboto font"/>
   <suffix name="opensans" label="Open Sans font"/>
   <suffix name="others" label="Fonts other than Roboto and Open Sans"/>
@@ -93136,7 +93141,7 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   <affected-histogram name="WebCore.WebSocket.MessageSize.Send"/>
 </histogram_suffixes>
 
-<histogram_suffixes name="WebStoreLinkExperiment">
+<histogram_suffixes name="WebStoreLinkExperiment" separator="_">
   <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"/>
@@ -93144,7 +93149,7 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   <affected-histogram name="NewTabPage.DefaultPageType"/>
 </histogram_suffixes>
 
-<histogram_suffixes name="WeekdayNames">
+<histogram_suffixes name="WeekdayNames" separator="_">
   <suffix name="Monday"/>
   <suffix name="Tuesday"/>
   <suffix name="Wednesday"/>
@@ -93155,7 +93160,7 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   <affected-histogram name="NewTabPage.ContentSuggestions.UsageTimeLocal"/>
 </histogram_suffixes>
 
-<histogram_suffixes name="WelcomeWin10Variant">
+<histogram_suffixes name="WelcomeWin10Variant" separator="_">
   <owner>tmartino@chromium.org</owner>
   <suffix name="InlineCombined" label="Inline layout style, combined promo"/>
   <suffix name="InlineDefault"