Remove HostContentSettingsMap::IsSettingAllowedForType

chrome/browser/profile_resetter/profile_resetter_unittest.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 "base/json/json_string_value_serializer.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 497 matching lines @@
     }
     ContentSetting default_setting =
         host_content_settings_map->GetDefaultContentSetting(content_type, NULL);
     default_settings[content_type] = default_setting;
     ContentSetting wildcard_setting = default_setting == CONTENT_SETTING_BLOCK
                                           ? CONTENT_SETTING_ALLOW
                                           : CONTENT_SETTING_BLOCK;
     ContentSetting site_setting = default_setting == CONTENT_SETTING_ALLOW
                                       ? CONTENT_SETTING_ALLOW
                                       : CONTENT_SETTING_BLOCK;
-    if (HostContentSettingsMap::IsSettingAllowedForType(
-            profile()->GetPrefs(), wildcard_setting, content_type)) {
+    if (info->IsSettingValid(wildcard_setting)) {
       host_content_settings_map->SetDefaultContentSetting(content_type,
                                                           wildcard_setting);
     }
-    if (HostContentSettingsMap::IsSettingAllowedForType(
-            profile()->GetPrefs(), site_setting, content_type)) {
+    if (info->IsSettingValid(site_setting)) {
       host_content_settings_map->SetContentSetting(
           pattern, ContentSettingsPattern::Wildcard(), content_type,
           std::string(), site_setting);
       ContentSettingsForOneType host_settings;
       host_content_settings_map->GetSettingsForOneType(
           content_type, std::string(), &host_settings);
       EXPECT_EQ(2U, host_settings.size());
     }
   }
 
@@ skipping 536 matching lines @@
       new ResettableSettingsSnapshot(profile()));
   deleted_snapshot->RequestShortcuts(base::Bind(&FeedbackCapture::Fail,
                                                 base::Unretained(&capture)));
   deleted_snapshot.reset();
   // Running remaining tasks shouldn't trigger the callback to be called as
   // |deleted_snapshot| was deleted before it could run.
   base::MessageLoop::current()->RunUntilIdle();
 }
 
 }  // namespace