[Android] Adding content settings provider for notification channels

components/content_settings/core/browser/host_content_settings_map.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 "components/content_settings/core/browser/host_content_settings_map.h"
 
 #include <stddef.h>
 
 #include <utility>
 
@@ skipping 37 matching lines @@
 struct ProviderNamesSourceMapEntry {
   const char* provider_name;
   content_settings::SettingSource provider_source;
 };
 
 const ProviderNamesSourceMapEntry kProviderNamesSourceMap[] = {
     {"platform_app", content_settings::SETTING_SOURCE_EXTENSION},
     {"policy", content_settings::SETTING_SOURCE_POLICY},
     {"supervised_user", content_settings::SETTING_SOURCE_SUPERVISED},
     {"extension", content_settings::SETTING_SOURCE_EXTENSION},
+    {"notification_android", content_settings::SETTING_SOURCE_USER},
     {"preference", content_settings::SETTING_SOURCE_USER},
     {"default", content_settings::SETTING_SOURCE_USER},
 };
 
 // Enum describing the status of domain to origin migration of content settings.
 // Migration will be done twice: once upon construction of the
 // HostContentSettingsMap (before syncing any content settings) and once after
 // sync has finished. We always migrate before sync to ensure that settings will
 // get migrated even if a user doesn't have sync enabled. We migrate after sync
 // to ensure that any sync'd settings will be migrated. Once these events have
@@ skipping 309 matching lines @@
 }
 
 void HostContentSettingsMap::SetWebsiteSettingCustomScope(
     const ContentSettingsPattern& primary_pattern,
     const ContentSettingsPattern& secondary_pattern,
     ContentSettingsType content_type,
     const std::string& resource_identifier,
     std::unique_ptr<base::Value> value) {
   DCHECK(SupportsResourceIdentifier(content_type) ||
          resource_identifier.empty());
+#if defined(OS_ANDROID)
+  // Disallow wildcard notification content setting updates on Android.
+  DCHECK(content_type != CONTENT_SETTINGS_TYPE_NOTIFICATIONS ||
+         GURL(primary_pattern.ToString()).is_valid());
+  // Disallow notification content setting updates that are not
+  // ALLOW/BLOCK/DEFAULT on Android.
+  DCHECK(content_type != CONTENT_SETTINGS_TYPE_NOTIFICATIONS ||
+         content_settings::ValueToContentSetting(value.get()) ==
+             CONTENT_SETTING_ALLOW ||
+         content_settings::ValueToContentSetting(value.get()) ==
+             CONTENT_SETTING_BLOCK ||
+         content_settings::ValueToContentSetting(value.get()) ==
+             CONTENT_SETTING_DEFAULT);

[raymes, 2017/05/18 00:39:37]

nit: let's leave this DCHECK of here for now. The only thing this is checking
that isn't already checked is that client code won't try to store ASK (we
already check validity of other settings). But that applies to many content
settings and we should probably address that separately. 

The DCHECK above seems ok for now. 

[awdf, 2017/05/19 17:59:57]

Acknowledged.

+#endif
+
   UsedContentSettingsProviders();
 
   for (const auto& provider_pair : content_settings_providers_) {
     if (provider_pair.second->SetWebsiteSetting(
             primary_pattern, secondary_pattern, content_type,
             resource_identifier, value.get())) {
       // If successful then ownership is passed to the provider.
       ignore_result(value.release());
       return;
     }
@@ skipping 506 matching lines @@
         return base::WrapUnique(rule.value.get()->DeepCopy());
       }
     }
   }
   return std::unique_ptr<base::Value>();
 }
 
 void HostContentSettingsMap::SetClockForTesting(
     std::unique_ptr<base::Clock> clock) {
   pref_provider_->SetClockForTesting(std::move(clock));
-}
+}