[Android] Adding content settings provider for notification channels

components/content_settings/core/browser/host_content_settings_map.cc

Index: components/content_settings/core/browser/host_content_settings_map.cc
diff --git a/components/content_settings/core/browser/host_content_settings_map.cc b/components/content_settings/core/browser/host_content_settings_map.cc
index 52a6708ea74cd789da27059c168cb63c4776712f..4e3498af70250f3d27db2f64ff3118a1824a47c0 100644
--- a/components/content_settings/core/browser/host_content_settings_map.cc
+++ b/components/content_settings/core/browser/host_content_settings_map.cc
@@ -8,6 +8,7 @@
 
 #include <utility>
 
+#include "base/android/jni_android.h"

[Peter Beverloo, 2017/05/15 15:10:09]

None of the changes in this file are used?

[awdf, 2017/05/16 15:17:36]

Indeed, about the jni stuff..

I do need to add an entry to the map though, to satisfy this nonobvious static
assert:
https://cs.chromium.org/chromium/src/components/content_settings/core/browser...
- but I forgot to update it..

Done.

 #include "base/command_line.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
@@ -36,6 +37,7 @@
 #include "net/base/static_cookie_policy.h"
 #include "url/gurl.h"
 
+using base::android::AttachCurrentThread;
 using content_settings::WebsiteSettingsInfo;
 using content_settings::ContentSettingsInfo;
 
@@ -55,6 +57,7 @@ const ProviderNamesSourceMapEntry kProviderNamesSourceMap[] = {
     {"policy", content_settings::SETTING_SOURCE_POLICY},
     {"supervised_user", content_settings::SETTING_SOURCE_SUPERVISED},
     {"extension", content_settings::SETTING_SOURCE_EXTENSION},
+    {"system", content_settings::SETTING_SOURCE_SYSTEM},
     {"preference", content_settings::SETTING_SOURCE_USER},
     {"default", content_settings::SETTING_SOURCE_USER},
 };
@@ -910,4 +913,4 @@ HostContentSettingsMap::GetContentSettingValueAndPatterns(
 void HostContentSettingsMap::SetClockForTesting(
     std::unique_ptr<base::Clock> clock) {
   pref_provider_->SetClockForTesting(std::move(clock));
-}
+}