Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(786)

Unified Diff: chrome/browser/content_settings/content_settings_usages_state_unittest.cc

Issue 1312453005: Removed Profile::GetHostContentSettingsMap (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed patch conflict Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/content_settings/content_settings_usages_state_unittest.cc
diff --git a/chrome/browser/content_settings/content_settings_usages_state_unittest.cc b/chrome/browser/content_settings/content_settings_usages_state_unittest.cc
index c6e3e46bae90111f6c08abfd8af5ad13063e4ab8..8fcbb67ca79ab1afbd1c19c029d667661b462d1b 100644
--- a/chrome/browser/content_settings/content_settings_usages_state_unittest.cc
+++ b/chrome/browser/content_settings/content_settings_usages_state_unittest.cc
@@ -7,6 +7,7 @@
#include <string>
#include "base/message_loop/message_loop.h"
+#include "chrome/browser/content_settings/host_content_settings_map_factory.h"
#include "chrome/common/pref_names.h"
#include "chrome/test/base/testing_profile.h"
#include "components/content_settings/core/browser/host_content_settings_map.h"
@@ -34,16 +35,18 @@ class ContentSettingsUsagesStateTests : public testing::Test {
protected:
void ClearOnNewOrigin(ContentSettingsType type) {
TestingProfile profile;
- ContentSettingsUsagesState state(profile.GetHostContentSettingsMap(), type,
- prefs::kAcceptLanguages,
- profile.GetPrefs());
+ ContentSettingsUsagesState state(
+ HostContentSettingsMapFactory::GetForProfile(&profile),
+ type,
+ prefs::kAcceptLanguages,
+ profile.GetPrefs());
GURL url_0("http://www.example.com");
ContentSettingsUsagesState::CommittedDetails details =
CreateDetailsWithURL(url_0);
state.DidNavigate(details);
- profile.GetHostContentSettingsMap()->SetContentSetting(
+ HostContentSettingsMapFactory::GetForProfile(&profile)->SetContentSetting(
ContentSettingsPattern::FromURLNoWildcard(url_0),
ContentSettingsPattern::FromURLNoWildcard(url_0),
type,
@@ -52,7 +55,7 @@ class ContentSettingsUsagesStateTests : public testing::Test {
state.OnPermissionSet(url_0, true);
GURL url_1("http://www.example1.com");
- profile.GetHostContentSettingsMap()->SetContentSetting(
+ HostContentSettingsMapFactory::GetForProfile(&profile)->SetContentSetting(
ContentSettingsPattern::FromURLNoWildcard(url_1),
ContentSettingsPattern::FromURLNoWildcard(url_0),
type,
@@ -138,16 +141,18 @@ class ContentSettingsUsagesStateTests : public testing::Test {
void ShowPortOnSameHost(ContentSettingsType type) {
TestingProfile profile;
- ContentSettingsUsagesState state(profile.GetHostContentSettingsMap(), type,
- prefs::kAcceptLanguages,
- profile.GetPrefs());
+ ContentSettingsUsagesState state(
+ HostContentSettingsMapFactory::GetForProfile(&profile),
+ type,
+ prefs::kAcceptLanguages,
+ profile.GetPrefs());
GURL url_0("http://www.example.com");
ContentSettingsUsagesState::CommittedDetails details =
CreateDetailsWithURL(url_0);
state.DidNavigate(details);
- profile.GetHostContentSettingsMap()->SetContentSetting(
+ HostContentSettingsMapFactory::GetForProfile(&profile)->SetContentSetting(
ContentSettingsPattern::FromURLNoWildcard(url_0),
ContentSettingsPattern::FromURLNoWildcard(url_0),
type,
@@ -156,7 +161,7 @@ class ContentSettingsUsagesStateTests : public testing::Test {
state.OnPermissionSet(url_0, true);
GURL url_1("https://www.example.com");
- profile.GetHostContentSettingsMap()->SetContentSetting(
+ HostContentSettingsMapFactory::GetForProfile(&profile)->SetContentSetting(
ContentSettingsPattern::FromURLNoWildcard(url_1),
ContentSettingsPattern::FromURLNoWildcard(url_0),
type,
@@ -165,7 +170,7 @@ class ContentSettingsUsagesStateTests : public testing::Test {
state.OnPermissionSet(url_1, true);
GURL url_2("http://www.example1.com");
- profile.GetHostContentSettingsMap()->SetContentSetting(
+ HostContentSettingsMapFactory::GetForProfile(&profile)->SetContentSetting(
ContentSettingsPattern::FromURLNoWildcard(url_2),
ContentSettingsPattern::FromURLNoWildcard(url_0),
type,

Powered by Google App Engine
This is Rietveld 408576698