Decouple MediaStreamInfoBarDelegate from GroupedPermissionInfoBarDelegate

chrome/browser/media/webrtc/media_stream_devices_controller.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/media/webrtc/media_stream_devices_controller.h"
 
 #include <map>
 #include <utility>
 
 #include "base/callback_helpers.h"
@@ skipping 297 matching lines @@
 void MediaStreamDevicesController::PermissionDenied() {
   RecordPermissionAction(request_, profile_,
                          base::Bind(PermissionUmaUtil::PermissionDenied));
   RunCallback(GetNewSetting(CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC,
                             old_audio_setting_, CONTENT_SETTING_BLOCK),
               GetNewSetting(CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA,
                             old_video_setting_, CONTENT_SETTING_BLOCK),
               content::MEDIA_DEVICE_PERMISSION_DENIED);
 }
 
-void MediaStreamDevicesController::GroupedRequestFinished(bool audio_accepted,
-                                                          bool video_accepted) {
-  RecordSinglePermissionAction(
-      request_, content::PermissionType::AUDIO_CAPTURE, profile_,
-      base::Bind(audio_accepted ? PermissionUmaUtil::PermissionGranted
-                                : PermissionUmaUtil::PermissionDenied));
-  RecordSinglePermissionAction(
-      request_, content::PermissionType::VIDEO_CAPTURE, profile_,
-      base::Bind(video_accepted ? PermissionUmaUtil::PermissionGranted
-                                : PermissionUmaUtil::PermissionDenied));
-
-  ContentSetting audio_setting =
-      audio_accepted ? CONTENT_SETTING_ALLOW : CONTENT_SETTING_BLOCK;
-  ContentSetting video_setting =
-      video_accepted ? CONTENT_SETTING_ALLOW : CONTENT_SETTING_BLOCK;
-  RunCallback(GetNewSetting(CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC,
-                            old_audio_setting_, audio_setting),
-              GetNewSetting(CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA,
-                            old_video_setting_, video_setting),
-              content::MEDIA_DEVICE_PERMISSION_DENIED);
-}
-
 bool MediaStreamDevicesController::ShouldShowPersistenceToggle() const {
   return PermissionUtil::ShouldShowPersistenceToggle();
 }
 
 void MediaStreamDevicesController::Cancelled() {
   RecordPermissionAction(request_, profile_,
                          base::Bind(PermissionUmaUtil::PermissionDismissed));
   RunCallback(old_audio_setting_, old_video_setting_,
               content::MEDIA_DEVICE_PERMISSION_DISMISSED);
 }
@@ skipping 296 matching lines @@
   if (android_permission_blocked)
     return false;
 
   // Don't approve device requests if the tab was hidden.
   // TODO(qinmin): Add a test for this. http://crbug.com/396869.
   // TODO(raymes): Shouldn't this apply to all permissions not just audio/video?
   return web_contents_->GetRenderWidgetHostView()->IsShowing();
 #endif
   return true;
 }