Remove MediaSettingChangedInfobar and show latest state in bubble

chrome/browser/content_settings/tab_specific_content_settings_unittest.cc

Index: chrome/browser/content_settings/tab_specific_content_settings_unittest.cc
diff --git a/chrome/browser/content_settings/tab_specific_content_settings_unittest.cc b/chrome/browser/content_settings/tab_specific_content_settings_unittest.cc
index 5d08a4b018b52ab7f8856d65f07e01a204646c24..ebcfa5450fb2152166c42a4c747330d80347a82e 100644
--- a/chrome/browser/content_settings/tab_specific_content_settings_unittest.cc
+++ b/chrome/browser/content_settings/tab_specific_content_settings_unittest.cc
@@ -74,8 +74,13 @@ TEST_F(TabSpecificContentSettingsTest, BlockedContent) {
                                     false);
   content_settings->OnContentBlocked(CONTENT_SETTINGS_TYPE_IMAGES);
   content_settings->SetPopupsBlocked(true);
-  content_settings->OnContentBlocked(CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC);
-  content_settings->OnContentBlocked(CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA);
+  MediaStreamDevicesController::MediaStreamTypeSettingsMap request_permissions;
+  request_permissions[content::MEDIA_DEVICE_AUDIO_CAPTURE].permission =
+      MediaStreamDevicesController::MEDIA_BLOCKED_BY_USER;
+  request_permissions[content::MEDIA_DEVICE_VIDEO_CAPTURE].permission =
+      MediaStreamDevicesController::MEDIA_BLOCKED_BY_USER;
+  content_settings->OnMediaStreamPermissionSet(GURL("http://google.com"),
+                                               request_permissions);
 
   // Check that only the respective content types are affected.
   EXPECT_TRUE(content_settings->IsContentBlocked(CONTENT_SETTINGS_TYPE_IMAGES));
@@ -226,7 +231,12 @@ TEST_F(TabSpecificContentSettingsTest, AllowedBlockedMediaContent) {
       CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA));
   ASSERT_FALSE(content_settings->IsContentBlocked(
       CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA));
-  ASSERT_EQ(TabSpecificContentSettings::MICROPHONE_CAMERA_ACCESSED,
+  // cam request should not affect previous mic settings.
+  ASSERT_TRUE(content_settings->IsContentAllowed(
+      CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC));
+  ASSERT_FALSE(content_settings->IsContentBlocked(
+      CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC));
+  ASSERT_EQ(TabSpecificContentSettings::CAMERA_ACCESSED,
             content_settings->GetMicrophoneCameraState());
 
   // Request and block microphone access.
@@ -239,7 +249,13 @@ TEST_F(TabSpecificContentSettingsTest, AllowedBlockedMediaContent) {
       CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC));
   ASSERT_TRUE(content_settings->IsContentBlocked(
       CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC));
-  ASSERT_EQ(TabSpecificContentSettings::CAMERA_ACCESSED,
+  // mic request should not affect previous cam settings.
+  ASSERT_TRUE(content_settings->IsContentAllowed(
+      CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA));
+  ASSERT_FALSE(content_settings->IsContentBlocked(
+      CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA));
+  ASSERT_EQ(TabSpecificContentSettings::MICROPHONE_ACCESSED |
+            TabSpecificContentSettings::MICROPHONE_BLOCKED,
             content_settings->GetMicrophoneCameraState());
 
   // Request and block camera access.
@@ -252,7 +268,13 @@ TEST_F(TabSpecificContentSettingsTest, AllowedBlockedMediaContent) {
       CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA));
   ASSERT_TRUE(content_settings->IsContentBlocked(
       CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA));
-  ASSERT_EQ(TabSpecificContentSettings::MICROPHONE_CAMERA_BLOCKED,
+  // cam request should not affect previous mic settings.
+  ASSERT_FALSE(content_settings->IsContentAllowed(
+      CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC));
+  ASSERT_TRUE(content_settings->IsContentBlocked(
+      CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC));
+  ASSERT_EQ(TabSpecificContentSettings::CAMERA_ACCESSED |
+            TabSpecificContentSettings::CAMERA_BLOCKED,
             content_settings->GetMicrophoneCameraState());
 
   // Request and allow microphone and camera access.
@@ -270,7 +292,8 @@ TEST_F(TabSpecificContentSettingsTest, AllowedBlockedMediaContent) {
       CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA));
   ASSERT_FALSE(content_settings->IsContentBlocked(
       CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA));
-  ASSERT_EQ(TabSpecificContentSettings::MICROPHONE_CAMERA_ACCESSED,
+  ASSERT_EQ(TabSpecificContentSettings::MICROPHONE_ACCESSED |
+            TabSpecificContentSettings::CAMERA_ACCESSED,
             content_settings->GetMicrophoneCameraState());
 
   // Request and block microphone and camera access.
@@ -288,7 +311,10 @@ TEST_F(TabSpecificContentSettingsTest, AllowedBlockedMediaContent) {
       CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA));
   ASSERT_TRUE(content_settings->IsContentBlocked(
       CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA));
-  ASSERT_EQ(TabSpecificContentSettings::MICROPHONE_CAMERA_BLOCKED,
+  ASSERT_EQ(TabSpecificContentSettings::MICROPHONE_ACCESSED |
+            TabSpecificContentSettings::MICROPHONE_BLOCKED |
+            TabSpecificContentSettings::CAMERA_ACCESSED |
+            TabSpecificContentSettings::CAMERA_BLOCKED,
             content_settings->GetMicrophoneCameraState());
 
   // Request microphone and camera access. Allow microphone, block camera.
@@ -304,7 +330,9 @@ TEST_F(TabSpecificContentSettingsTest, AllowedBlockedMediaContent) {
       CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA));
   ASSERT_TRUE(content_settings->IsContentBlocked(
       CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA));
-  ASSERT_EQ(TabSpecificContentSettings::MICROPHONE_ACCESSED,
+  ASSERT_EQ(TabSpecificContentSettings::MICROPHONE_ACCESSED |
+            TabSpecificContentSettings::CAMERA_ACCESSED |
+            TabSpecificContentSettings::CAMERA_BLOCKED,
             content_settings->GetMicrophoneCameraState());
 
   // Request microphone and camera access. Block microphone, allow camera.
@@ -322,7 +350,9 @@ TEST_F(TabSpecificContentSettingsTest, AllowedBlockedMediaContent) {
       CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA));
   ASSERT_FALSE(content_settings->IsContentBlocked(
       CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA));
-  ASSERT_EQ(TabSpecificContentSettings::CAMERA_ACCESSED,
+  ASSERT_EQ(TabSpecificContentSettings::MICROPHONE_ACCESSED |
+            TabSpecificContentSettings::MICROPHONE_BLOCKED |
+            TabSpecificContentSettings::CAMERA_ACCESSED,
             content_settings->GetMicrophoneCameraState());
 }