Remove worker pool names from TaskScheduler.TaskLatency.* histograms.

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 06a962e5f5d7ccf149c6cb7d33398df4a5972375..e2dc9184b03881a1b851aae54e431222efca071c 100644
--- a/tools/metrics/histograms/histograms.xml
+++ b/tools/metrics/histograms/histograms.xml
@@ -115624,6 +115624,16 @@ value.
   <affected-histogram name="Tabs.SwitchFromUserLatency"/>
 </histogram_suffixes>
 
+<histogram_suffixes name="TaskSchedulerMayBlock" separator=".">
+  <suffix name="MayBlock"
+      label="Applies to tasks posted with MayBlock() or
+             WithBaseSyncPrimitives()."/>
+  <affected-histogram name="TaskScheduler.TaskLatency.BackgroundTaskPriority"/>
+  <affected-histogram
+      name="TaskScheduler.TaskLatency.UserBlockingTaskPriority"/>
+  <affected-histogram name="TaskScheduler.TaskLatency.UserVisibleTaskPriority"/>
+</histogram_suffixes>
+
 <histogram_suffixes name="TaskSchedulerTaskPriority" separator=".">
   <suffix name="BackgroundTaskPriority"
       label="Applies to tasks posted with a BACKGROUND priority."/>
@@ -115631,10 +115641,27 @@ value.
       label="Applies to tasks posted with a USER_VISIBLE priority."/>
   <suffix name="UserBlockingTaskPriority"
       label="Applies to tasks posted with a USER_BLOCKING priority."/>
-  <affected-histogram name="TaskScheduler.TaskLatency.BackgroundFileIOPool"/>
-  <affected-histogram name="TaskScheduler.TaskLatency.BackgroundPool"/>
-  <affected-histogram name="TaskScheduler.TaskLatency.ForegroundFileIOPool"/>
-  <affected-histogram name="TaskScheduler.TaskLatency.ForegroundPool"/>
+  <affected-histogram name="TaskScheduler.TaskLatency"/>
+  <affected-histogram name="TaskScheduler.TaskLatency.BackgroundFileIOPool">
+    <obsolete>
+      Deprecated 12/2016. Pool name removed from task latency histogram name.
+    </obsolete>
+  </affected-histogram>
+  <affected-histogram name="TaskScheduler.TaskLatency.BackgroundPool">
+    <obsolete>
+      Deprecated 12/2016. Pool name removed from task latency histogram name.
+    </obsolete>
+  </affected-histogram>
+  <affected-histogram name="TaskScheduler.TaskLatency.ForegroundFileIOPool">
+    <obsolete>
+      Deprecated 12/2016. Pool name removed from task latency histogram name.
+    </obsolete>
+  </affected-histogram>
+  <affected-histogram name="TaskScheduler.TaskLatency.ForegroundPool">
+    <obsolete>
+      Deprecated 12/2016. Pool name removed from task latency histogram name.
+    </obsolete>
+  </affected-histogram>
 </histogram_suffixes>
 
 <histogram_suffixes name="TaskSchedulerWorkerPool" separator=".">
@@ -115647,7 +115674,11 @@ value.
   <affected-histogram name="TaskScheduler.DetachDuration"/>
   <affected-histogram name="TaskScheduler.NumTasksBeforeDetach"/>
   <affected-histogram name="TaskScheduler.NumTasksBetweenWaits"/>
-  <affected-histogram name="TaskScheduler.TaskLatency"/>
+  <affected-histogram name="TaskScheduler.TaskLatency">
+    <obsolete>
+      Deprecated 12/2016. Pool name removed from task latency histogram name.
+    </obsolete>
+  </affected-histogram>
 </histogram_suffixes>
 
 <histogram_suffixes name="ThreadWatcher" separator=".">