Remove MediaSettingChangedInfobar and show latest state in bubble

chrome/browser/content_settings/tab_specific_content_settings_unittest.cc

 // 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.
 
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/test/test_browser_thread.h"
@@ skipping 56 matching lines @@
 
   // Set a cookie, block access to images, block mediastream access and block a
   // popup.
   content_settings->OnCookieChanged(GURL("http://google.com"),
                                     GURL("http://google.com"),
                                     "A=B",
                                     options,
                                     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));
   EXPECT_FALSE(
       content_settings->IsContentBlocked(CONTENT_SETTINGS_TYPE_JAVASCRIPT));
   EXPECT_FALSE(
       content_settings->IsContentBlocked(CONTENT_SETTINGS_TYPE_PLUGINS));
   EXPECT_FALSE(
       content_settings->IsContentBlocked(CONTENT_SETTINGS_TYPE_COOKIES));
   EXPECT_TRUE(content_settings->IsContentBlocked(CONTENT_SETTINGS_TYPE_POPUPS));
@@ skipping 130 matching lines @@
   // Request and allow camera access.
   request_permissions.clear();
   request_permissions[content::MEDIA_DEVICE_VIDEO_CAPTURE].permission =
       MediaStreamDevicesController::MEDIA_ALLOWED;
   content_settings->OnMediaStreamPermissionSet(security_origin,
                                                request_permissions);
   ASSERT_TRUE(content_settings->IsContentAllowed(
       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.
   request_permissions.clear();
   request_permissions[content::MEDIA_DEVICE_AUDIO_CAPTURE].permission =
       MediaStreamDevicesController::MEDIA_BLOCKED_BY_USER;
   content_settings->OnMediaStreamPermissionSet(security_origin,
                                                request_permissions);
   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,
+  // 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.
   request_permissions.clear();
   request_permissions[content::MEDIA_DEVICE_VIDEO_CAPTURE].permission =
       MediaStreamDevicesController::MEDIA_BLOCKED_BY_USER;
   content_settings->OnMediaStreamPermissionSet(security_origin,
                                                request_permissions);
   ASSERT_FALSE(content_settings->IsContentAllowed(
       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.
   request_permissions[content::MEDIA_DEVICE_AUDIO_CAPTURE].permission =
       MediaStreamDevicesController::MEDIA_ALLOWED;
   request_permissions[content::MEDIA_DEVICE_VIDEO_CAPTURE].permission =
       MediaStreamDevicesController::MEDIA_ALLOWED;
   content_settings->OnMediaStreamPermissionSet(security_origin,
                                                request_permissions);
   ASSERT_TRUE(content_settings->IsContentAllowed(
       CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC));
   ASSERT_FALSE(content_settings->IsContentBlocked(
       CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC));
   ASSERT_TRUE(content_settings->IsContentAllowed(
       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.
   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(security_origin,
                                                request_permissions);
   ASSERT_FALSE(content_settings->IsContentAllowed(
       CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC));
   ASSERT_TRUE(content_settings->IsContentBlocked(
       CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC));
   ASSERT_FALSE(content_settings->IsContentAllowed(
       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.
   request_permissions[content::MEDIA_DEVICE_AUDIO_CAPTURE].permission =
       MediaStreamDevicesController::MEDIA_ALLOWED;
   content_settings->OnMediaStreamPermissionSet(security_origin,
                                                request_permissions);
   ASSERT_TRUE(content_settings->IsContentAllowed(
       CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC));
   ASSERT_FALSE(content_settings->IsContentBlocked(
       CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC));
   ASSERT_FALSE(content_settings->IsContentAllowed(
       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.
   request_permissions[content::MEDIA_DEVICE_AUDIO_CAPTURE].permission =
       MediaStreamDevicesController::MEDIA_BLOCKED_BY_USER;
   request_permissions[content::MEDIA_DEVICE_VIDEO_CAPTURE].permission =
       MediaStreamDevicesController::MEDIA_ALLOWED;
   content_settings->OnMediaStreamPermissionSet(security_origin,
                                                request_permissions);
   ASSERT_FALSE(content_settings->IsContentAllowed(
       CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC));
   ASSERT_TRUE(content_settings->IsContentBlocked(
       CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC));
   ASSERT_TRUE(content_settings->IsContentAllowed(
       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());
 }
 
 TEST_F(TabSpecificContentSettingsTest, EmptyCookieList) {
   TabSpecificContentSettings* content_settings =
       TabSpecificContentSettings::FromWebContents(web_contents());
 
   ASSERT_FALSE(
       content_settings->IsContentAllowed(CONTENT_SETTINGS_TYPE_COOKIES));
   ASSERT_FALSE(
@@ skipping 37 matching lines @@
                                         base::UTF8ToUTF16("text"),
                                         blocked_by_policy);
   content_settings->OnLocalStorageAccessed(GURL("http://google.com"),
                                            true,
                                            blocked_by_policy);
   content_settings->OnWebDatabaseAccessed(GURL("http://google.com"),
                                           base::UTF8ToUTF16("name"),
                                           base::UTF8ToUTF16("display_name"),
                                           blocked_by_policy);
 }