[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>
 
+#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"
 #include "base/metrics/histogram_macros.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "base/time/clock.h"
 #include "build/build_config.h"
 #include "components/content_settings/core/browser/content_settings_default_provider.h"
 #include "components/content_settings/core/browser/content_settings_details.h"
 #include "components/content_settings/core/browser/content_settings_info.h"
 #include "components/content_settings/core/browser/content_settings_observable_provider.h"
 #include "components/content_settings/core/browser/content_settings_policy_provider.h"
 #include "components/content_settings/core/browser/content_settings_pref_provider.h"
 #include "components/content_settings/core/browser/content_settings_provider.h"
 #include "components/content_settings/core/browser/content_settings_registry.h"
 #include "components/content_settings/core/browser/content_settings_rule.h"
 #include "components/content_settings/core/browser/content_settings_utils.h"
 #include "components/content_settings/core/browser/website_settings_registry.h"
 #include "components/content_settings/core/common/content_settings_pattern.h"
 #include "components/content_settings/core/common/pref_names.h"
 #include "components/pref_registry/pref_registry_syncable.h"
 #include "components/prefs/pref_service.h"
 #include "net/base/net_errors.h"
 #include "net/base/static_cookie_policy.h"
 #include "url/gurl.h"
 
+using base::android::AttachCurrentThread;
 using content_settings::WebsiteSettingsInfo;
 using content_settings::ContentSettingsInfo;
 
 namespace {
 
 typedef std::vector<content_settings::Rule> Rules;
 
 typedef std::pair<std::string, std::string> StringPair;
 
 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},
+    {"system", content_settings::SETTING_SOURCE_SYSTEM},
     {"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 835 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));
-}
+}