[Chrome Settings UI] Show overruled User Exceptions as strike-through.

chrome/browser/content_settings/host_content_settings_map_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 <memory>
 #include <string>
 
 #include "base/auto_reset.h"
 #include "base/command_line.h"
 #include "base/json/json_reader.h"
@@ skipping 63 matching lines @@
 
   void ClearPolicyDefault() {
     prefs_->RemoveManagedPref(policy_default_setting_);
   }
 
   void SetPolicyDefault(ContentSetting setting) {
     prefs_->SetManagedPref(policy_default_setting_,
                            new base::FundamentalValue(setting));
   }
 
-  bool AreUserExceptionsAllowed() {
-    return host_content_settings_map_->AreUserExceptionsAllowedForType(
-        content_type_);
-  }
-
   void AddUserException(std::string exception,
                         ContentSetting content_settings) {
     ContentSettingsPattern pattern =
         ContentSettingsPattern::FromString(exception);
     host_content_settings_map_->SetContentSettingCustomScope(
         pattern, pattern, content_type_, std::string(), content_settings);
   }
 
   // Wrapper to query GetWebsiteSetting(), and only return the source.
   content_settings::SettingSource GetSettingSourceForURL(
@@ skipping 763 matching lines @@
   std::unique_ptr<base::Value> stored_value =
       host_content_settings_map->GetWebsiteSetting(
           host, host, CONTENT_SETTINGS_TYPE_USB_CHOOSER_DATA, std::string(),
           nullptr);
   EXPECT_TRUE(stored_value && stored_value->Equals(&test_value));
   EXPECT_EQ(nullptr, otr_map->GetWebsiteSetting(
                          host, host, CONTENT_SETTINGS_TYPE_USB_CHOOSER_DATA,
                          std::string(), nullptr));
 }
 
-TEST_F(HostContentSettingsMapTest, AreUserExceptionsAllowedForType) {
-  ContentSettingsType kContentTypesToTest[] = {
-    CONTENT_SETTINGS_TYPE_COOKIES,
-    CONTENT_SETTINGS_TYPE_POPUPS,
-  };
-
-  TestingProfile profile;
-
-  for (ContentSettingsType type : kContentTypesToTest) {
-    TesterForType tester(&profile, type);
-
-    // No settings: Yes.
-    tester.ClearPolicyDefault();
-    EXPECT_TRUE(tester.AreUserExceptionsAllowed());
-
-    // Policy enforces default value: No.
-    tester.SetPolicyDefault(CONTENT_SETTING_ALLOW);
-    EXPECT_FALSE(tester.AreUserExceptionsAllowed());
-    tester.SetPolicyDefault(CONTENT_SETTING_BLOCK);
-    EXPECT_FALSE(tester.AreUserExceptionsAllowed());
-
-    // Cleanup for next iteration.
-    tester.ClearPolicyDefault();
-  }
-}
-
 TEST_F(HostContentSettingsMapTest, PrefExceptionsOperation) {
   using content_settings::SETTING_SOURCE_POLICY;
   using content_settings::SETTING_SOURCE_USER;
 
   const char kUrl1[] = "http://user_exception_allow.com";
   const char kUrl2[] = "http://user_exception_block.com";
   const char kUrl3[] = "http://non_exception.com";
 
   TestingProfile profile;
   // Arbitrarily using cookies as content type to test.
@@ skipping 433 matching lines @@
                 host, host, CONTENT_SETTINGS_TYPE_KEYGEN, std::string()));
 
   // After migrating old settings, changes to the setting works.
   host_content_settings_map->SetContentSettingDefaultScope(
       host, GURL(), CONTENT_SETTINGS_TYPE_KEYGEN, std::string(),
       CONTENT_SETTING_BLOCK);
   EXPECT_EQ(CONTENT_SETTING_BLOCK,
             host_content_settings_map->GetContentSetting(
                 host, host, CONTENT_SETTINGS_TYPE_KEYGEN, std::string()));
 }