| Index: chrome/browser/content_settings/host_content_settings_map_unittest.cc
|
| diff --git a/chrome/browser/content_settings/host_content_settings_map_unittest.cc b/chrome/browser/content_settings/host_content_settings_map_unittest.cc
|
| index 224d978a69bef0816bac0ca2fbe9c01c9ce26549..fb9aa25e9a8346b88641afb34e46afc51d42f818 100644
|
| --- a/chrome/browser/content_settings/host_content_settings_map_unittest.cc
|
| +++ b/chrome/browser/content_settings/host_content_settings_map_unittest.cc
|
| @@ -28,8 +28,12 @@ namespace {
|
| bool SettingsEqual(const ContentSettings& settings1,
|
| const ContentSettings& settings2) {
|
| for (int i = 0; i < CONTENT_SETTINGS_NUM_TYPES; ++i) {
|
| - if (settings1.settings[i] != settings2.settings[i])
|
| + if (settings1.settings[i] != settings2.settings[i]) {
|
| + LOG(ERROR) << "type: " << i
|
| + << " [expected: " << settings1.settings[i]
|
| + << " actual: " << settings2.settings[i] << "]";
|
| return false;
|
| + }
|
| }
|
| return true;
|
| }
|
| @@ -154,6 +158,8 @@ TEST_F(HostContentSettingsMapTest, IndividualSettings) {
|
| CONTENT_SETTING_ASK;
|
| desired_settings.settings[CONTENT_SETTINGS_TYPE_INTENTS] =
|
| CONTENT_SETTING_ASK;
|
| + desired_settings.settings[CONTENT_SETTINGS_TYPE_AUTO_SELECT_CERTIFICATE] =
|
| + CONTENT_SETTING_ASK;
|
| ContentSettings settings =
|
| host_content_settings_map->GetContentSettings(host, host);
|
| EXPECT_TRUE(SettingsEqual(desired_settings, settings));
|
| @@ -602,6 +608,8 @@ TEST_F(HostContentSettingsMapTest, NestedSettings) {
|
| CONTENT_SETTING_ASK;
|
| desired_settings.settings[CONTENT_SETTINGS_TYPE_INTENTS] =
|
| CONTENT_SETTING_ASK;
|
| + desired_settings.settings[CONTENT_SETTINGS_TYPE_AUTO_SELECT_CERTIFICATE] =
|
| + CONTENT_SETTING_ASK;
|
| ContentSettings settings =
|
| host_content_settings_map->GetContentSettings(host, host);
|
| EXPECT_TRUE(SettingsEqual(desired_settings, settings));
|
| @@ -794,6 +802,8 @@ TEST_F(HostContentSettingsMapTest, NonDefaultSettings) {
|
| ContentSettingsPattern::FromString("[*.]example.com");
|
|
|
| ContentSettings desired_settings(CONTENT_SETTING_DEFAULT);
|
| + desired_settings.settings[CONTENT_SETTINGS_TYPE_AUTO_SELECT_CERTIFICATE] =
|
| + CONTENT_SETTING_ASK;
|
| ContentSettings settings =
|
| host_content_settings_map->GetNonDefaultContentSettings(host, host);
|
| EXPECT_TRUE(SettingsEqual(desired_settings, settings));
|
|
|