Make media permission requests go through the PermissionManager

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 956a7f651189f7161fb016b1443ba4d8bd0d6091..87bb65f60d96a23ec53526724298e1df69999097 100644
--- a/tools/metrics/histograms/histograms.xml
+++ b/tools/metrics/histograms/histograms.xml
@@ -31619,8 +31619,8 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
 <histogram name="Navigation.MainFrameSchemeOTR" enum="NavigationScheme">
   <owner>elawrence@chromium.org</owner>
   <owner>estark@chromium.org</owner>
-  <summary>The scheme of the URL for each main-frame navigation while in
-    incognito.
+  <summary>
+    The scheme of the URL for each main-frame navigation while in     incognito.
   </summary>
 </histogram>
 
@@ -109171,6 +109171,8 @@ from previous Chrome versions.
       label="PERMISSION_BUBBLE_PERMISSION_PROTECTED_MEDIA_IDENTIFIER"/>
   <int value="11" label="PERMISSION_BUBBLE_PERMISSION_PUSH_MESSAGING"/>
   <int value="12" label="PERMISSION_BUBBLE_PERMISSION_FLASH"/>
+  <int value="13" label="PERMISSION_MEDIASTREAM_MIC"/>
+  <int value="14" label="PERMISSION_MEDIASTREAM_CAMERA"/>
 </enum>
 
 <enum name="PermissionStatus" type="int">