projects / platform / framework / web / crosswalk.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Update To 11.40.268.0
[platform/framework/web/crosswalk.git] / src / chrome / browser / content_settings / tab_specific_content_settings_unittest.cc
diff --git a/src/chrome/browser/content_settings/tab_specific_content_settings_unittest.cc b/src/chrome/browser/content_settings/tab_specific_content_settings_unittest.cc
index 5d08a4b..d537246 100644 (file)
--- a/src/chrome/browser/content_settings/tab_specific_content_settings_unittest.cc
+++ b/src/chrome/browser/content_settings/tab_specific_content_settings_unittest.cc
@@ -38,7 +38,7 @@ class MockSiteDataObserver
 
 class TabSpecificContentSettingsTest : public ChromeRenderViewHostTestHarness {
  public:
-  virtual void SetUp() OVERRIDE {
+  void SetUp() override {
     ChromeRenderViewHostTestHarness::SetUp();
     TabSpecificContentSettings::CreateForWebContents(web_contents());
   }
@@ -74,8 +74,18 @@ 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);
+  TabSpecificContentSettings::MicrophoneCameraState
+      blocked_microphone_camera_state =
+          TabSpecificContentSettings::MICROPHONE_ACCESSED |
+          TabSpecificContentSettings::MICROPHONE_BLOCKED |
+          TabSpecificContentSettings::CAMERA_ACCESSED |
+          TabSpecificContentSettings::CAMERA_BLOCKED;
+  content_settings->OnMediaStreamPermissionSet(GURL("http://google.com"),
+                                               blocked_microphone_camera_state,
+                                               std::string(),
+                                               std::string(),
+                                               std::string(),
+                                               std::string());
 
   // Check that only the respective content types are affected.
   EXPECT_TRUE(content_settings->IsContentBlocked(CONTENT_SETTINGS_TYPE_IMAGES));
@@ -194,138 +204,6 @@ TEST_F(TabSpecificContentSettingsTest, AllowedContent) {
       content_settings->IsContentBlocked(CONTENT_SETTINGS_TYPE_COOKIES));
 }
 
-TEST_F(TabSpecificContentSettingsTest, AllowedBlockedMediaContent) {
-  TabSpecificContentSettings* content_settings =
-      TabSpecificContentSettings::FromWebContents(web_contents());
-
-  ASSERT_EQ(TabSpecificContentSettings::MICROPHONE_CAMERA_NOT_ACCESSED,
-            content_settings->GetMicrophoneCameraState());
-
-  // Request and allow microphone access.
-  GURL security_origin("http://google.com");
-  MediaStreamDevicesController::MediaStreamTypeSettingsMap
-      request_permissions;
-  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_EQ(TabSpecificContentSettings::MICROPHONE_ACCESSED,
-            content_settings->GetMicrophoneCameraState());
-
-  // 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,
-            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,
-            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,
-            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,
-            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,
-            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,
-            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,
-            content_settings->GetMicrophoneCameraState());
-}
-
 TEST_F(TabSpecificContentSettingsTest, EmptyCookieList) {
   TabSpecificContentSettings* content_settings =
       TabSpecificContentSettings::FromWebContents(web_contents());
Domain: Web Framework / Uncategorized;