chrome/browser/content_settings/tab_specific_content_settings_unittest.cc - Issue 588153003: Remove MediaSettingChangedInfobar and show latest state in bubble

Unified Diff: chrome/browser/content_settings/tab_specific_content_settings_unittest.cc

Issue 588153003: Remove MediaSettingChangedInfobar and show latest state in bubble (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Remove redundant is_cam Created 6 years, 3 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« chrome/browser/content_settings/tab_specific_content_settings.cc ('K') | « chrome/browser/content_settings/tab_specific_content_settings.cc ('k') | chrome/browser/ui/content_settings/content_setting_bubble_model.cc » ('j') | chrome/browser/ui/content_settings/content_setting_bubble_model.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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..1846fb700671c59dea856d2517c554d2d36ff5ab 100644

--- a/chrome/browser/content_settings/tab_specific_content_settings_unittest.cc

+++ b/chrome/browser/content_settings/tab_specific_content_settings_unittest.cc

@@ -226,7 +226,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 access.

@@ -252,7 +253,8 @@ 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_BLOCKED |

+ TabSpecificContentSettings::CAMERA_BLOCKED,

content_settings->GetMicrophoneCameraState());

// Request and allow microphone and camera access.

@@ -270,7 +272,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 +291,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.