Refactor the content interface for RequestMediaAccessPermission.

content/public/common/media_stream_request.h

 // 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.
 
 #ifndef CONTENT_PUBLIC_COMMON_MEDIA_STREAM_REQUEST_H_
 #define CONTENT_PUBLIC_COMMON_MEDIA_STREAM_REQUEST_H_
 
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
+#include "base/callback.h"
 #include "content/common/content_export.h"
 #include "googleurl/src/gurl.h"
 
 namespace content {
 
 // Types of media streams.
 enum MediaStreamDeviceType {
   MEDIA_STREAM_DEVICE_TYPE_NO_SERVICE = 0,
   MEDIA_STREAM_DEVICE_TYPE_AUDIO_CAPTURE,
   MEDIA_STREAM_DEVICE_TYPE_VIDEO_CAPTURE,
@@ skipping 15 matching lines @@
 
   // The device's "friendly" name. Not guaranteed to be unique.
   std::string name;
 };
 
 typedef std::vector<MediaStreamDevice> MediaStreamDevices;
 
 typedef std::map<MediaStreamDeviceType, MediaStreamDevices>
     MediaStreamDeviceMap;
 
+typedef base::Callback< void(const MediaStreamDevices&) > MediaResponseCallback;

[jam, 2012/06/11 05:31:57]

nit: I realize you put this here because it's used by both
render_view_host_delegate.h and web_contents_delegate.h. but this is an odd
place, since 1) it's only used in \browser, and 2) it's not used here. I think
it would be better to duplicate it in the RVHD.

[Evan Stade, 2012/06/12 00:00:46]

done, although it leads to the somewhat funky include of web_contents_delegate.h
in media_stream_infobar_delegate.h

+
 // Represents a request for media streams (audio/video).
 struct CONTENT_EXPORT MediaStreamRequest {
   MediaStreamRequest(
       int render_process_id,
       int render_view_id,
       const GURL& security_origin);
 
   ~MediaStreamRequest();
 
   // The render process id generating this request.
   int render_process_id;
 
   // The render view id generating this request.
   int render_view_id;
 
   // The WebKit security origin for the current request (e.g. "html5rocks.com").
   GURL security_origin;
 
   // A list of devices present on the user's computer, for each device type
   // requested.
   MediaStreamDeviceMap devices;
 };
 
 }  // namespace content
 
 #endif  // CONTENT_PUBLIC_COMMON_MEDIA_STREAM_REQUEST_H_