Remove MediaSettingChangedInfobar and show latest state in bubble

chrome/browser/content_settings/tab_specific_content_settings.h

Index: chrome/browser/content_settings/tab_specific_content_settings.h
diff --git a/chrome/browser/content_settings/tab_specific_content_settings.h b/chrome/browser/content_settings/tab_specific_content_settings.h
index b3b8d2d6c7dacc7c8f6f58d8629b3a2afdb94945..366af72f1d81d5d59fcd376756d1bac83e58f9be 100644
--- a/chrome/browser/content_settings/tab_specific_content_settings.h
+++ b/chrome/browser/content_settings/tab_specific_content_settings.h
@@ -211,9 +211,21 @@ class TabSpecificContentSettings
     return media_stream_requested_video_device_;
   }
 
+  const std::string& media_stream_selected_audio_device() const {
+    return media_stream_selected_audio_device_;
+  }
+
+  const std::string& media_stream_selected_video_device() const {
+    return media_stream_selected_video_device_;
+  }
+
   // Returns the state of the camera and microphone usage.
   MicrophoneCameraState GetMicrophoneCameraState() const;
 
+  // Returns whether the state of the camera and microphone settings have

[Peter Kasting, 2014/09/22 23:11:23]

Nit: Remove "the state of", or else change "have" to "has"

It's also slightly inconsistent that here we refer to the "state of the
settings" but elsewhere (e.g. down below) it's more of a reference to the "state
of the microphone and camera" (no "settings").  The state of the devices and the
state of our settings for the devices are two different things.  Be clear and
consistent.

[robwu, 2014/09/24 00:03:04]

Done.

+  // changed since the last media stream request.
+  bool IsMicrophoneCameraStateChanged() const;
+
   // Returns the ContentSettingsUsagesState that controls the
   // geolocation API usage on this page.
   const ContentSettingsUsagesState& geolocation_usages_state() const {
@@ -413,6 +425,12 @@ class TabSpecificContentSettings
   // stored here. http://crbug.com/259794
   GURL media_stream_access_origin_;
 
+  // The microphone and camera state at the last media stream request.
+  MicrophoneCameraState microphone_camera_state_;
+  // The most selected devices at the the of the media stream request.

[Peter Kasting, 2014/09/22 23:11:23]

Nit: "most selected"?

[robwu, 2014/09/24 00:03:04]

Done.

+  std::string media_stream_selected_audio_device_;
+  std::string media_stream_selected_video_device_;
+
   // The devices to be displayed in the media bubble when the media stream
   // request is requesting certain specific devices.
   std::string media_stream_requested_audio_device_;