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..e3e3dc96b4b1d8f7f8cf8efbcaba26e2e98cec00 100644
--- a/chrome/browser/content_settings/tab_specific_content_settings.h
+++ b/chrome/browser/content_settings/tab_specific_content_settings.h
@@ -45,14 +45,14 @@ class TabSpecificContentSettings
       public content_settings::Observer,
       public content::WebContentsUserData<TabSpecificContentSettings> {
  public:
+  // Flags for use in microphone_camera_state_. If *_BLOCKED is set, then
+  // its corresponding *_ALLOWED flag must also be set.

[Peter Kasting, 2014/09/24 01:33:00]

Was _ALLOWED here supposed to be _ACCESSED?  If so, write it that way -- and
that would completely change my understanding (encoded in my other comments) of
what the values here mean.  I was assuming that the ACCESSED is the opposite of
BLOCKED, as opposed to BLOCKED implying ACCESSED.  (The fact that I can be
confused about something basic like this implies that the existing names and
comments need to be clarified.)

Perhaps this:

Fields describing the current mic/camera state.  If a page has attempted to
access a device, the XXX_ACCESSED bit will be set.  In that case, the value of
the corresponding XXX_BLOCKED bit corresponds to whether the access was blocked
or allowed.  Otherwise, the XXX_BLOCKED bit is ignored.

   enum MicrophoneCameraState {

[Peter Kasting, 2014/09/24 01:33:00]

Nit: Don't use an enum to declare bitmasks.  Use constants instead, because this
is semantically no longer an enumeration.

[robwu, 2014/09/24 23:38:44]

Done.

     MICROPHONE_CAMERA_NOT_ACCESSED = 0,
-    MICROPHONE_ACCESSED,
-    CAMERA_ACCESSED,
-    MICROPHONE_CAMERA_ACCESSED,
-    MICROPHONE_BLOCKED,
-    CAMERA_BLOCKED,
-    MICROPHONE_CAMERA_BLOCKED,
+    MICROPHONE_ACCESSED = 1 << 0,
+    MICROPHONE_BLOCKED = 1 << 1,
+    CAMERA_ACCESSED = 1 << 2,
+    CAMERA_BLOCKED = 1 << 3,
   };
 
   // Classes that want to be notified about site data events must implement
@@ -211,8 +211,20 @@ 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;
+  unsigned GetMicrophoneCameraState() const;

[Peter Kasting, 2014/09/24 01:33:00]

(Here and elsewhere) Use types like uint32_t instead of "unsigned" for
bitfields, so it's clear how many bits are available for use.  (Basically,
"unsigned" should never be used in our codebase.)

You should also typedef this, so that it's clear to readers that the code in
question is dealing with these state values, not integers.

[robwu, 2014/09/24 23:38:44]

Done.

+
+  // Returns whether the state of the camera and microphone usage or device has
+  // changed.
+  bool IsMicrophoneCameraStateChanged() const;
 
   // Returns the ContentSettingsUsagesState that controls the
   // geolocation API usage on this page.
@@ -413,6 +425,13 @@ class TabSpecificContentSettings
   // stored here. http://crbug.com/259794
   GURL media_stream_access_origin_;
 
+  // The microphone and camera state at the last media stream request.
+  // This value is composed of MicrophoneCameraState values.
+  unsigned microphone_camera_state_;
+  // The selected devices at the last media stream request.
+  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_;