Remove HostContentSettingsMap::IsSettingAllowedForType

chrome/browser/profile_resetter/profile_resetter.cc

 // Copyright (c) 2013 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 "chrome/browser/profile_resetter/profile_resetter.h"
 
 #include <string>
 
 #include "base/prefs/pref_service.h"
 #include "base/prefs/scoped_user_pref_update.h"
 #include "base/synchronization/cancellation_flag.h"
 #include "chrome/browser/browsing_data/browsing_data_helper.h"
 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/google/google_url_tracker_factory.h"
 #include "chrome/browser/profile_resetter/brandcoded_default_settings.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_iterator.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/installer/util/browser_distribution.h"
+#include "components/content_settings/core/browser/content_settings_info.h"
+#include "components/content_settings/core/browser/content_settings_registry.h"
 #include "components/content_settings/core/browser/host_content_settings_map.h"
 #include "components/content_settings/core/browser/website_settings_info.h"
 #include "components/content_settings/core/browser/website_settings_registry.h"
 #include "components/google/core/browser/google_url_tracker.h"
 #include "components/search_engines/search_engines_pref_names.h"
 #include "components/search_engines/template_url_prepopulate_data.h"
 #include "components/search_engines/template_url_service.h"
 #include "content/public/browser/browser_thread.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/browser/management_policy.h"
@@ skipping 177 matching lines @@
 
   if (master_settings_->GetShowHomeButton(&show_home_button))
     prefs->SetBoolean(prefs::kShowHomeButton, show_home_button);
   else
     prefs->ClearPref(prefs::kShowHomeButton);
   MarkAsDone(HOMEPAGE);
 }
 
 void ProfileResetter::ResetContentSettings() {
   DCHECK(CalledOnValidThread());
-  PrefService* prefs = profile_->GetPrefs();
   HostContentSettingsMap* map =
       HostContentSettingsMapFactory::GetForProfile(profile_);
 
-  content_settings::WebsiteSettingsRegistry* registry =
-      content_settings::WebsiteSettingsRegistry::GetInstance();
-  for (const content_settings::WebsiteSettingsInfo* info : *registry) {
+  for (const content_settings::WebsiteSettingsInfo* info :
+       *content_settings::WebsiteSettingsRegistry::GetInstance()) {
     map->ClearSettingsForOneType(info->type());
-    if (HostContentSettingsMap::IsSettingAllowedForType(

[engedy, 2015/10/06 08:53:25]

I think something like this check needs to remain to prevent trying to set the
default value to content settings such as:

CONTENT_SETTINGS_TYPE_PROTOCOL_HANDLERS
CONTENT_SETTINGS_TYPE_MIXEDSCRIPT
CONTENT_SETTINGS_TYPE_MEDIASTREAM

[raymes, 2015/10/12 00:03:12]

This should still work - CONTENT_SETTING_DEFAULT results in clearing the content
setting, which just won't do anything important for those settings.

-            prefs, CONTENT_SETTING_DEFAULT, info->type())) {
-      // TODO(raymes): Why don't we just set this to
-      // info->intial_default_value().
-      map->SetDefaultContentSetting(info->type(), CONTENT_SETTING_DEFAULT);
-    }
+  }
+
+  // TODO(raymes): The default value isn't really used for website settings
+  // right now, but if it were we should probably reset that here too.
+  for (const content_settings::ContentSettingsInfo* info :
+       *content_settings::ContentSettingsRegistry::GetInstance()) {
+    map->SetDefaultContentSetting(info->website_settings_info()->type(),
+                                  CONTENT_SETTING_DEFAULT);
   }
   MarkAsDone(CONTENT_SETTINGS);
 }
 
 void ProfileResetter::ResetCookiesAndSiteData() {
   DCHECK(CalledOnValidThread());
   DCHECK(!cookies_remover_);
 
   cookies_remover_ = BrowsingDataRemover::CreateForUnboundedRange(profile_);
   cookies_remover_->AddObserver(this);
@@ skipping 107 matching lines @@
         chrome_exe,
         false,
         cancel,
         &shortcuts);
   }
   return shortcuts;
 #else
   return std::vector<ShortcutCommand>();
 #endif
 }