This CL is part of https://codereview.chromium.org/11316275/, but only contains the changes related to the infobar.

The new design for the media infobar included in this patch:
# Use the confirm infobar for media, this will make the media infobar be consistent with other infobars in chrome like Geolocation.
# Remove the devices array in the media_stream_request since the infobar does not have a device dropdown any more.
# "Allow" will be sticky by default.
# Start using the device selection UI in the content settings.

Note, "Deny" is not sticky in this patch, it can't be done since the media code in content settings needs a big refactoring to handle the exceptions properly. It will be addressed in another CL.


BUG=163895
TEST=content_unittests, pyauto webrtc functional tests.
and manual tests like:
select a device via content setting media
go to https://webrtc-demos.appspot.com/html/pc1.html, and make a call.

Review URL: https://chromiumcodereview.appspot.com/11434084

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@172610 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 15 insertions, 15 deletions

diff --git a/content/public/common/media_stream_request.cc b/content/public/common/media_stream_request.cc
index 35fe2d8..622b18af 100644
--- a/content/public/common/media_stream_request.cc
+++ b/content/public/common/media_stream_request.cc
@@ -30,19 +30,16 @@ MediaStreamDevice::~MediaStreamDevice() {}
 MediaStreamRequest::MediaStreamRequest(
     int render_process_id,
     int render_view_id,
-    const GURL& security_origin)
+    const GURL& security_origin,
+    MediaStreamDeviceType audio_type,
+    MediaStreamDeviceType video_type)
     : render_process_id(render_process_id),
       render_view_id(render_view_id),
-      security_origin(security_origin) {
+      security_origin(security_origin),
+      audio_type(audio_type),
+      video_type(video_type) {
 }
 
-MediaStreamRequest::~MediaStreamRequest() {
-  for (MediaStreamDeviceMap::iterator iter = devices.begin();
-       iter != devices.end();
-       ++iter) {
-    iter->second.clear();
-  }
-  devices.clear();
-}
+MediaStreamRequest::~MediaStreamRequest() {}
 
 }  // namespace content
diff --git a/content/public/common/media_stream_request.h b/content/public/common/media_stream_request.h
index ccd868f..90210c4 100644
--- a/content/public/common/media_stream_request.h
+++ b/content/public/common/media_stream_request.h
@@ -65,7 +65,9 @@ struct CONTENT_EXPORT MediaStreamRequest {
   MediaStreamRequest(
       int render_process_id,
       int render_view_id,
-      const GURL& security_origin);
+      const GURL& security_origin,
+      MediaStreamDeviceType audio_type,
+      MediaStreamDeviceType video_type);
 
   ~MediaStreamRequest();
 
@@ -78,10 +80,11 @@ struct CONTENT_EXPORT MediaStreamRequest {
   // 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.
-  // All the elements in this map will be deleted in ~MediaStreamRequest().
-  MediaStreamDeviceMap devices;
+  // Flag to indicate if the request contains audio.
+  MediaStreamDeviceType audio_type;
+
+  // Flag to indicate if the request contains video.
+  MediaStreamDeviceType video_type;
 };
 
 }  // namespace content