[WebsiteSettings] Change permission bubble API to adapt to new mocks.

chrome/browser/media/media_stream_devices_controller.cc

Index: chrome/browser/media/media_stream_devices_controller.cc
diff --git a/chrome/browser/media/media_stream_devices_controller.cc b/chrome/browser/media/media_stream_devices_controller.cc
index 3b4e46149ddb10859cbaac0a30e028bbc49f775a..89d1569baed5541d1fc075495811a9c35208ab1f 100644
--- a/chrome/browser/media/media_stream_devices_controller.cc
+++ b/chrome/browser/media/media_stream_devices_controller.cc
@@ -349,6 +349,13 @@ void MediaStreamDevicesController::Deny(bool update_content_setting) {
   cb.Run(content::MediaStreamDevices(), scoped_ptr<content::MediaStreamUI>());
 }
 
+int MediaStreamDevicesController::GetIconID() const {
+  if (HasVideo())
+    return IDR_INFOBAR_MEDIA_STREAM_CAMERA;
+
+  return IDR_INFOBAR_MEDIA_STREAM_MIC;
+}
+
 base::string16 MediaStreamDevicesController::GetMessageText() const {
   int message_id = IDS_MEDIA_CAPTURE_AUDIO_AND_VIDEO;
   if (!HasAudio())
@@ -368,14 +375,9 @@ base::string16 MediaStreamDevicesController::GetMessageTextFragment() const {
   return l10n_util::GetStringUTF16(message_id);
 }
 
-base::string16
-MediaStreamDevicesController::GetAlternateAcceptButtonText() const {
-  return l10n_util::GetStringUTF16(IDS_MEDIA_CAPTURE_ALLOW);
-}
-
-base::string16
-MediaStreamDevicesController::GetAlternateDenyButtonText() const {
-  return l10n_util::GetStringUTF16(IDS_MEDIA_CAPTURE_DENY);
+bool MediaStreamDevicesController::HasUserGesture() const {
+  // TODO(gbillock): plumb this through
+  return false;
 }
 
 void MediaStreamDevicesController::PermissionGranted() {