Expose the Website Settings page in the Content Setting page if it is enabled via flag.

chrome/browser/content_settings/host_content_settings_map.cc

Index: chrome/browser/content_settings/host_content_settings_map.cc
diff --git a/chrome/browser/content_settings/host_content_settings_map.cc b/chrome/browser/content_settings/host_content_settings_map.cc
index 40b6fe1be7a169aa97e859c6fa75061111824b90..5cb97504afbcf6f9addb91385151dfa5b17f7c8e 100644
--- a/chrome/browser/content_settings/host_content_settings_map.cc
+++ b/chrome/browser/content_settings/host_content_settings_map.cc
@@ -201,10 +201,6 @@ ContentSetting HostContentSettingsMap::GetDefaultContentSetting(
     }
   }
 
-  // The method GetDefaultContentSetting always has to return an explicit
-  // value that is to be used as default. We here rely on the
-  // DefaultProvider to always provide a value.
-  NOTREACHED();

[Bernhard Bauer, 2014/09/15 09:13:49]

Why is this not the case anymore?

[Daniel Nishi, 2014/09/15 16:57:27]

If we ask for a default content setting for a content setting whose actual
default is CONTENT_SETTING_DEFAULT from the DefaultProvider, it will fall
through and trigger the NOTREACHED().

[Bernhard Bauer, 2014/09/15 17:05:38]

Yeah, but the point of the DefaultProvider is that it will always return a
(non-DEFAULT) setting... Why doesn't that happen?

[Daniel Nishi, 2014/09/15 17:43:53]

In some cases, the idea of a default setting doesn't make sense, like for
protocol handlers. In this case, the DefaultSettingsProvider returns the value
CONTENT_SETTING_DEFAULT.

   return CONTENT_SETTING_DEFAULT;
 }