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

Unified Diff: chrome/browser/permissions/permission_context_base_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/permissions/permission_context_base_unittest.cc
diff --git a/chrome/browser/permissions/permission_context_base_unittest.cc b/chrome/browser/permissions/permission_context_base_unittest.cc
index d0d21e1630d5c4342863459e7b3a74e5c693352a..3e672099546186d4a3ad21d8c9283c85d7a81367 100644
--- a/chrome/browser/permissions/permission_context_base_unittest.cc
+++ b/chrome/browser/permissions/permission_context_base_unittest.cc
@@ -6,6 +6,7 @@
#include "base/bind.h"
#include "base/command_line.h"
+#include "chrome/browser/content_settings/host_content_settings_map_factory.h"
#include "chrome/browser/infobars/infobar_service.h"
#include "chrome/browser/permissions/permission_queue_controller.h"
#include "chrome/browser/permissions/permission_request_id.h"
@@ -116,9 +117,11 @@ class PermissionContextBaseTests : public ChromeRenderViewHostTestHarness {
EXPECT_TRUE(permission_context.tab_context_updated());
ContentSetting setting =
- profile()->GetHostContentSettingsMap()->GetContentSetting(
- url.GetOrigin(), url.GetOrigin(),
- CONTENT_SETTINGS_TYPE_NOTIFICATIONS, std::string());
+ HostContentSettingsMapFactory::GetForProfile(profile())
+ ->GetContentSetting(url.GetOrigin(),
+ url.GetOrigin(),
+ CONTENT_SETTINGS_TYPE_NOTIFICATIONS,
+ std::string());
EXPECT_EQ(CONTENT_SETTING_ALLOW, setting);
}
@@ -144,9 +147,11 @@ class PermissionContextBaseTests : public ChromeRenderViewHostTestHarness {
EXPECT_TRUE(permission_context.tab_context_updated());
ContentSetting setting =
- profile()->GetHostContentSettingsMap()->GetContentSetting(
- url.GetOrigin(), url.GetOrigin(),
- CONTENT_SETTINGS_TYPE_MIDI_SYSEX, std::string());
+ HostContentSettingsMapFactory::GetForProfile(profile())
+ ->GetContentSetting(url.GetOrigin(),
+ url.GetOrigin(),
+ CONTENT_SETTINGS_TYPE_MIDI_SYSEX,
+ std::string());
EXPECT_EQ(CONTENT_SETTING_ASK, setting);
}
@@ -171,8 +176,11 @@ class PermissionContextBaseTests : public ChromeRenderViewHostTestHarness {
EXPECT_TRUE(permission_context.tab_context_updated());
ContentSetting setting =
- profile()->GetHostContentSettingsMap()->GetContentSetting(
- url.GetOrigin(), url.GetOrigin(), type, std::string());
+ HostContentSettingsMapFactory::GetForProfile(profile())
+ ->GetContentSetting(url.GetOrigin(),
+ url.GetOrigin(),
+ type,
+ std::string());
EXPECT_EQ(CONTENT_SETTING_ASK, setting);
}
@@ -198,20 +206,24 @@ class PermissionContextBaseTests : public ChromeRenderViewHostTestHarness {
EXPECT_TRUE(permission_context.tab_context_updated());
ContentSetting setting =
- profile()->GetHostContentSettingsMap()->GetContentSetting(
- url.GetOrigin(), url.GetOrigin(),
- type, std::string());
+ HostContentSettingsMapFactory::GetForProfile(profile())
+ ->GetContentSetting(url.GetOrigin(),
+ url.GetOrigin(),
+ type,
+ std::string());
EXPECT_EQ(CONTENT_SETTING_ALLOW, setting);
// Try to reset permission.
permission_context.ResetPermission(url.GetOrigin(), url.GetOrigin());
ContentSetting setting_after_reset =
- profile()->GetHostContentSettingsMap()->GetContentSetting(
- url.GetOrigin(), url.GetOrigin(),
- type, std::string());
+ HostContentSettingsMapFactory::GetForProfile(profile())
+ ->GetContentSetting(url.GetOrigin(),
+ url.GetOrigin(),
+ type,
+ std::string());
ContentSetting default_setting =
- profile()->GetHostContentSettingsMap()->GetDefaultContentSetting(
- type, nullptr);
+ HostContentSettingsMapFactory::GetForProfile(profile())
+ ->GetDefaultContentSetting(type, nullptr);
EXPECT_EQ(default_setting, setting_after_reset);
}
« no previous file with comments | « chrome/browser/permissions/permission_context_base.cc ('k') | chrome/browser/permissions/permission_context_factory_base.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698