Commit acdee60f authored by Allen Bauer's avatar Allen Bauer Committed by Commit Bot

Fix PermissionMenuModelTest for SecondaryUiMd mode.

Under MD, these unit tests invoke PageInfoUI::PermissionActionToUIString(..)
which require the permission to have a source set. Use
content_settings::SETTING_SOURCE_USER.

Bug: 713030
Change-Id: I2ce0ece216dddc9dd1aff26b5dc166ce1ae437e5
Reviewed-on: https://chromium-review.googlesource.com/742347Reviewed-by: default avatarTrent Apted <tapted@chromium.org>
Reviewed-by: default avatarBret Sepulveda <bsep@chromium.org>
Commit-Queue: Trent Apted <tapted@chromium.org>
Cr-Commit-Position: refs/heads/master@{#512676}
parent 80c50c4b
...@@ -41,6 +41,7 @@ TEST_F(PermissionMenuModelTest, TestDefault) { ...@@ -41,6 +41,7 @@ TEST_F(PermissionMenuModelTest, TestDefault) {
permission.type = CONTENT_SETTINGS_TYPE_COOKIES; permission.type = CONTENT_SETTINGS_TYPE_COOKIES;
permission.setting = CONTENT_SETTING_ALLOW; permission.setting = CONTENT_SETTING_ALLOW;
permission.default_setting = CONTENT_SETTING_ALLOW; permission.default_setting = CONTENT_SETTING_ALLOW;
permission.source = content_settings::SETTING_SOURCE_USER;
permission.is_incognito = false; permission.is_incognito = false;
PermissionMenuModel model(profile(), GURL("http://www.google.com"), PermissionMenuModel model(profile(), GURL("http://www.google.com"),
permission, callback.callback()); permission, callback.callback());
...@@ -56,6 +57,7 @@ TEST_F(PermissionMenuModelTest, TestDefaultMediaHttp) { ...@@ -56,6 +57,7 @@ TEST_F(PermissionMenuModelTest, TestDefaultMediaHttp) {
permission.type = type; permission.type = type;
permission.setting = CONTENT_SETTING_ALLOW; permission.setting = CONTENT_SETTING_ALLOW;
permission.default_setting = CONTENT_SETTING_ALLOW; permission.default_setting = CONTENT_SETTING_ALLOW;
permission.source = content_settings::SETTING_SOURCE_USER;
permission.is_incognito = false; permission.is_incognito = false;
PermissionMenuModel model(profile(), GURL("http://www.google.com"), PermissionMenuModel model(profile(), GURL("http://www.google.com"),
permission, callback.callback()); permission, callback.callback());
...@@ -69,6 +71,7 @@ TEST_F(PermissionMenuModelTest, TestIncognitoNotifications) { ...@@ -69,6 +71,7 @@ TEST_F(PermissionMenuModelTest, TestIncognitoNotifications) {
permission.type = CONTENT_SETTINGS_TYPE_NOTIFICATIONS; permission.type = CONTENT_SETTINGS_TYPE_NOTIFICATIONS;
permission.setting = CONTENT_SETTING_ASK; permission.setting = CONTENT_SETTING_ASK;
permission.default_setting = CONTENT_SETTING_ASK; permission.default_setting = CONTENT_SETTING_ASK;
permission.source = content_settings::SETTING_SOURCE_USER;
permission.is_incognito = false; permission.is_incognito = false;
PermissionMenuModel regular_model(profile(), GURL("https://www.google.com"), PermissionMenuModel regular_model(profile(), GURL("https://www.google.com"),
...@@ -87,6 +90,7 @@ TEST_F(PermissionMenuModelTest, TestSubresourceFilter) { ...@@ -87,6 +90,7 @@ TEST_F(PermissionMenuModelTest, TestSubresourceFilter) {
permission.type = CONTENT_SETTINGS_TYPE_ADS; permission.type = CONTENT_SETTINGS_TYPE_ADS;
permission.setting = CONTENT_SETTING_BLOCK; permission.setting = CONTENT_SETTING_BLOCK;
permission.default_setting = CONTENT_SETTING_BLOCK; permission.default_setting = CONTENT_SETTING_BLOCK;
permission.source = content_settings::SETTING_SOURCE_USER;
permission.is_incognito = false; permission.is_incognito = false;
PermissionMenuModel model(profile(), GURL("http://www.google.com"), PermissionMenuModel model(profile(), GURL("http://www.google.com"),
permission, callback.callback()); permission, callback.callback());
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment