BASELINE: Update Chromium to 64.0.3282.139

Change-Id: I1cae68fe9c94ff7608b26b8382fc19862cdb293a
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>

1 files changed, 49 insertions, 120 deletions

diff --git a/chromium/components/content_settings/core/browser/host_content_settings_map.cc b/chromium/components/content_settings/core/browser/host_content_settings_map.cc
index a0d868c3335..78e80b3bd91 100644
--- a/chromium/components/content_settings/core/browser/host_content_settings_map.cc
+++ b/chromium/components/content_settings/core/browser/host_content_settings_map.cc
@@ -54,8 +54,12 @@ struct ProviderNamesSourceMapEntry {
   content_settings::SettingSource provider_source;
 };
 
-const ProviderNamesSourceMapEntry kProviderNamesSourceMap[] = {
-    {"platform_app", content_settings::SETTING_SOURCE_EXTENSION},
+const HostContentSettingsMap::ProviderType kFirstProvider =
+    HostContentSettingsMap::POLICY_PROVIDER;
+const HostContentSettingsMap::ProviderType kFirstUserModifiableProvider =
+    HostContentSettingsMap::NOTIFICATION_ANDROID_PROVIDER;
+
+constexpr ProviderNamesSourceMapEntry kProviderNamesSourceMap[] = {
     {"policy", content_settings::SETTING_SOURCE_POLICY},
     {"supervised_user", content_settings::SETTING_SOURCE_SUPERVISED},
     {"extension", content_settings::SETTING_SOURCE_EXTENSION},
@@ -66,28 +70,27 @@ const ProviderNamesSourceMapEntry kProviderNamesSourceMap[] = {
     {"tests_other", 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
-// occurred, we won't perform migration again.
-enum DomainToOriginMigrationStatus {
-  // Haven't been migrated at all.
-  NOT_MIGRATED,
-  // Have done migration in the constructor of HostContentSettingsMap.
-  MIGRATED_BEFORE_SYNC,
-  // Have done migration both in HostContentSettingsMap construction and and
-  // after sync is finished. No migration will happen after this point.
-  MIGRATED_AFTER_SYNC,
-};
-
 static_assert(
     arraysize(kProviderNamesSourceMap) ==
         HostContentSettingsMap::NUM_PROVIDER_TYPES,
     "kProviderNamesSourceMap should have NUM_PROVIDER_TYPES elements");
 
+// Ensure that kFirstUserModifiableProvider is actually the highest precedence
+// user modifiable provider.
+constexpr bool FirstUserModifiableProviderIsHighestPrecedence() {
+  for (size_t i = 0; i < kFirstUserModifiableProvider; ++i) {
+    if (kProviderNamesSourceMap[i].provider_source ==
+        content_settings::SETTING_SOURCE_USER) {
+      return false;
+    }
+  }
+  return kProviderNamesSourceMap[kFirstUserModifiableProvider]
+             .provider_source == content_settings::SETTING_SOURCE_USER;
+}
+static_assert(FirstUserModifiableProviderIsHighestPrecedence(),
+              "kFirstUserModifiableProvider is not the highest precedence user "
+              "modifiable provider.");
+
 // Returns true if the |content_type| supports a resource identifier.
 // Resource identifiers are supported (but not required) for plugins.
 bool SupportsResourceIdentifier(ContentSettingsType content_type) {
@@ -220,7 +223,6 @@ HostContentSettingsMap::HostContentSettingsMap(PrefService* prefs,
   default_provider->AddObserver(this);
   content_settings_providers_[DEFAULT_PROVIDER] = std::move(default_provider);
 
-  MigrateDomainScopedSettings(false);
   RecordExceptionMetrics();
 }
 
@@ -231,8 +233,6 @@ void HostContentSettingsMap::RegisterProfilePrefs(
   content_settings::ContentSettingsRegistry::GetInstance();
 
   registry->RegisterIntegerPref(prefs::kContentSettingsWindowLastTabIndex, 0);
-  registry->RegisterIntegerPref(prefs::kDomainToOriginMigrationStatus,
-                                NOT_MIGRATED);
 
   // Register the prefs for the content settings providers.
   content_settings::DefaultProvider::RegisterProfilePrefs(registry);
@@ -332,7 +332,20 @@ ContentSetting HostContentSettingsMap::GetContentSetting(
   DCHECK(content_settings::ContentSettingsRegistry::GetInstance()->Get(
       content_type));
   std::unique_ptr<base::Value> value = GetWebsiteSetting(
-      primary_url, secondary_url, content_type, resource_identifier, NULL);
+      primary_url, secondary_url, content_type, resource_identifier, nullptr);
+  return content_settings::ValueToContentSetting(value.get());
+}
+
+ContentSetting HostContentSettingsMap::GetUserModifiableContentSetting(
+    const GURL& primary_url,
+    const GURL& secondary_url,
+    ContentSettingsType content_type,
+    const std::string& resource_identifier) const {
+  DCHECK(content_settings::ContentSettingsRegistry::GetInstance()->Get(
+      content_type));
+  std::unique_ptr<base::Value> value = GetWebsiteSettingInternal(
+      primary_url, secondary_url, content_type, resource_identifier,
+      kFirstUserModifiableProvider, nullptr);
   return content_settings::ValueToContentSetting(value.get());
 }
 
@@ -451,7 +464,7 @@ content_settings::PatternPair HostContentSettingsMap::GetNarrowestPatterns (
   // of creating a new rule that would be hidden behind the existing rule.
   content_settings::SettingInfo info;
   std::unique_ptr<base::Value> v = GetWebsiteSettingInternal(
-      primary_url, secondary_url, type, std::string(), &info);
+      primary_url, secondary_url, type, std::string(), kFirstProvider, &info);
   if (info.source != content_settings::SETTING_SOURCE_USER) {
     // Return an invalid pattern if the current setting is not a user setting
     // and thus can't be changed.
@@ -516,89 +529,6 @@ void HostContentSettingsMap::SetContentSettingDefaultScope(
                                resource_identifier, setting);
 }
 
-void HostContentSettingsMap::MigrateDomainScopedSettings(bool after_sync) {
-  DomainToOriginMigrationStatus status =
-      static_cast<DomainToOriginMigrationStatus>(
-          prefs_->GetInteger(prefs::kDomainToOriginMigrationStatus));
-  if (status == MIGRATED_AFTER_SYNC)
-    return;
-  if (status == MIGRATED_BEFORE_SYNC && !after_sync)
-    return;
-  DCHECK(status != NOT_MIGRATED || !after_sync);
-
-  const ContentSettingsType kDomainScopedTypes[] = {
-      CONTENT_SETTINGS_TYPE_IMAGES,
-      CONTENT_SETTINGS_TYPE_PLUGINS,
-      CONTENT_SETTINGS_TYPE_JAVASCRIPT,
-      CONTENT_SETTINGS_TYPE_AUTOMATIC_DOWNLOADS,
-      CONTENT_SETTINGS_TYPE_POPUPS};
-  for (const ContentSettingsType& type : kDomainScopedTypes) {
-    if (!content_settings::ContentSettingsRegistry::GetInstance()->Get(type))
-      continue;
-    ContentSettingsForOneType settings;
-    GetSettingsForOneType(type, std::string(), &settings);
-
-    for (const ContentSettingPatternSource& setting_entry : settings) {
-      // Migrate user preference settings only.
-      if (setting_entry.source != "preference")
-        continue;
-      // Migrate ALLOW settings only.
-      if (setting_entry.GetContentSetting() != CONTENT_SETTING_ALLOW)
-        continue;
-      // Skip default settings.
-      if (setting_entry.primary_pattern == ContentSettingsPattern::Wildcard())
-        continue;
-
-      if (setting_entry.secondary_pattern !=
-          ContentSettingsPattern::Wildcard()) {
-        NOTREACHED();
-        continue;
-      }
-
-      ContentSettingsPattern origin_pattern;
-      if (!ContentSettingsPattern::MigrateFromDomainToOrigin(
-              setting_entry.primary_pattern, &origin_pattern)) {
-        continue;
-      }
-
-      if (!origin_pattern.IsValid())
-        continue;
-
-      GURL origin(origin_pattern.ToString());
-      DCHECK(origin.is_valid());
-
-      // Ensure that the current resolved content setting for this origin is
-      // allowed. Otherwise we may be overriding some narrower setting which is
-      // set to block.
-      ContentSetting origin_setting =
-          GetContentSetting(origin, origin, type, std::string());
-
-      // Remove the domain scoped pattern. If |origin_setting| is not
-      // CONTENT_SETTING_ALLOW it implies there is some narrower pattern in
-      // effect, so it's still safe to remove the domain-scoped pattern.
-      SetContentSettingCustomScope(setting_entry.primary_pattern,
-                                   setting_entry.secondary_pattern, type,
-                                   std::string(), CONTENT_SETTING_DEFAULT);
-
-      // If the current resolved content setting is allowed it's safe to set the
-      // origin-scoped pattern.
-      if (origin_setting == CONTENT_SETTING_ALLOW)
-        SetContentSettingCustomScope(
-            ContentSettingsPattern::FromURLNoWildcard(origin),
-            ContentSettingsPattern::Wildcard(), type, std::string(),
-            CONTENT_SETTING_ALLOW);
-    }
-  }
-
-  if (status == NOT_MIGRATED) {
-    prefs_->SetInteger(prefs::kDomainToOriginMigrationStatus,
-                       MIGRATED_BEFORE_SYNC);
-  } else if (status == MIGRATED_BEFORE_SYNC) {
-    prefs_->SetInteger(prefs::kDomainToOriginMigrationStatus,
-                       MIGRATED_AFTER_SYNC);
-  }
-}
-
 base::WeakPtr<HostContentSettingsMap> HostContentSettingsMap::GetWeakPtr() {
   return weak_ptr_factory_.GetWeakPtr();
 }
@@ -738,7 +668,7 @@ HostContentSettingsMap::~HostContentSettingsMap() {
 void HostContentSettingsMap::ShutdownOnUIThread() {
   DCHECK(thread_checker_.CalledOnValidThread());
   DCHECK(prefs_);
-  prefs_ = NULL;
+  prefs_ = nullptr;
   for (const auto& provider_pair : content_settings_providers_)
     provider_pair.second->ShutdownOnUIThread();
 }
@@ -807,7 +737,7 @@ std::unique_ptr<base::Value> HostContentSettingsMap::GetWebsiteSetting(
   }
 
   return GetWebsiteSettingInternal(primary_url, secondary_url, content_type,
-                                   resource_identifier, info);
+                                   resource_identifier, kFirstProvider, info);
 }
 
 // static
@@ -827,10 +757,11 @@ std::unique_ptr<base::Value> HostContentSettingsMap::GetWebsiteSettingInternal(
     const GURL& secondary_url,
     ContentSettingsType content_type,
     const std::string& resource_identifier,
+    ProviderType first_provider_to_search,
     content_settings::SettingInfo* info) const {
   UsedContentSettingsProviders();
-  ContentSettingsPattern* primary_pattern = NULL;
-  ContentSettingsPattern* secondary_pattern = NULL;
+  ContentSettingsPattern* primary_pattern = nullptr;
+  ContentSettingsPattern* secondary_pattern = nullptr;
   if (info) {
     primary_pattern = &info->primary_pattern;
     secondary_pattern = &info->secondary_pattern;
@@ -838,15 +769,14 @@ std::unique_ptr<base::Value> HostContentSettingsMap::GetWebsiteSettingInternal(
 
   // The list of |content_settings_providers_| is ordered according to their
   // precedence.
-  for (const auto& provider_pair : content_settings_providers_) {
+  auto it = content_settings_providers_.lower_bound(first_provider_to_search);
+  for (; it != content_settings_providers_.end(); ++it) {
     std::unique_ptr<base::Value> value = GetContentSettingValueAndPatterns(
-        provider_pair.second.get(), primary_url, secondary_url, content_type,
-        resource_identifier, is_incognito_, primary_pattern,
-        secondary_pattern);
+        it->second.get(), primary_url, secondary_url, content_type,
+        resource_identifier, is_incognito_, primary_pattern, secondary_pattern);
     if (value) {
       if (info)
-        info->source =
-            kProviderNamesSourceMap[provider_pair.first].provider_source;
+        info->source = kProviderNamesSourceMap[it->first].provider_source;
       return value;
     }
   }
@@ -919,7 +849,6 @@ HostContentSettingsMap::GetContentSettingValueAndPatterns(
   return std::unique_ptr<base::Value>();
 }
 
-void HostContentSettingsMap::SetClockForTesting(
-    std::unique_ptr<base::Clock> clock) {
-  pref_provider_->SetClockForTesting(std::move(clock));
+void HostContentSettingsMap::SetClockForTesting(base::Clock* clock) {
+  pref_provider_->SetClockForTesting(clock);
 }