refactor to Introduce AUDIO_CAPTURE and VIDEO_CAPTURE permissions.

chrome/browser/permissions/permission_manager.cc

Index: chrome/browser/permissions/permission_manager.cc
diff --git a/chrome/browser/permissions/permission_manager.cc b/chrome/browser/permissions/permission_manager.cc
index e39955ab7c364015d180c9bb05e67b771d752814..324a1c72f912064ea62ea328b04a39aa2a77fdec 100644
--- a/chrome/browser/permissions/permission_manager.cc
+++ b/chrome/browser/permissions/permission_manager.cc
@@ -63,6 +63,10 @@ ContentSettingsType PermissionTypeToContentSetting(PermissionType permission) {
     case PermissionType::MIDI:
       // This will hit the NOTREACHED below.
       break;
+    case PermissionType::AUDIO_RECORDING:
+      return CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC;
+    case PermissionType::VIDEO_RECORDING:
+      return CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA;
     case PermissionType::NUM:
       // This will hit the NOTREACHED below.
       break;
@@ -207,9 +211,8 @@ PermissionStatus PermissionManager::GetPermissionStatus(
   if (!context)
     return content::PERMISSION_STATUS_DENIED;
 
-  return ContentSettingToPermissionStatus(
-      context->GetPermissionStatus(requesting_origin.GetOrigin(),
-                                   embedding_origin.GetOrigin()));
+  return ContentSettingToPermissionStatus(context->GetPermissionStatus(
+      requesting_origin.GetOrigin(), embedding_origin.GetOrigin()));

[palmer, 2015/08/28 01:44:21]

Yeah, unfortunately, GURL::GetOrigin is not the right thing, even though you'd
think it would be. You can construct a url::Origin, which is the right thing,
from a GURL though.

[guoweis_left_chromium, 2015/08/28 16:16:20]

Will use a bug to track this.

 }
 
 void PermissionManager::RegisterPermissionUsage(PermissionType permission,