chrome/browser/media/midi_permission_context_unittest.cc - Issue 1312453005: Removed Profile::GetHostContentSettingsMap

Unified Diff: chrome/browser/media/midi_permission_context_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

« no previous file with comments | « chrome/browser/media/midi_permission_context_factory.cc ('k') | chrome/browser/media/protected_media_identifier_permission_context_factory.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/media/midi_permission_context_unittest.cc

diff --git a/chrome/browser/media/midi_permission_context_unittest.cc b/chrome/browser/media/midi_permission_context_unittest.cc

index 21e2411f6b89fc7604893b289e2e64c84c6c37b6..3256130e5986e7c2b30c40529eb665400e966a83 100644

--- a/chrome/browser/media/midi_permission_context_unittest.cc

+++ b/chrome/browser/media/midi_permission_context_unittest.cc

@@ -5,6 +5,7 @@

#include "chrome/browser/media/midi_permission_context.h"

#include "base/bind.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"

@@ -103,9 +104,11 @@ TEST_F(MidiPermissionContextTests, TestInsecureRequestingUrl) {

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);

}

@@ -117,17 +120,23 @@ TEST_F(MidiPermissionContextTests, TestInsecureQueryingUrl) {

// Check that there is no saved content settings.

EXPECT_EQ(CONTENT_SETTING_ASK,

- profile()->GetHostContentSettingsMap()->GetContentSetting(

- insecure_url.GetOrigin(), insecure_url.GetOrigin(),

- CONTENT_SETTINGS_TYPE_MIDI_SYSEX, std::string()));

+ HostContentSettingsMapFactory::GetForProfile(profile())

+ ->GetContentSetting(insecure_url.GetOrigin(),

+ insecure_url.GetOrigin(),

+ CONTENT_SETTINGS_TYPE_MIDI_SYSEX,

+ std::string()));

EXPECT_EQ(CONTENT_SETTING_ASK,

- profile()->GetHostContentSettingsMap()->GetContentSetting(

- secure_url.GetOrigin(), insecure_url.GetOrigin(),

- CONTENT_SETTINGS_TYPE_MIDI_SYSEX, std::string()));

+ HostContentSettingsMapFactory::GetForProfile(profile())

+ ->GetContentSetting(secure_url.GetOrigin(),

+ insecure_url.GetOrigin(),

+ CONTENT_SETTINGS_TYPE_MIDI_SYSEX,

+ std::string()));

EXPECT_EQ(CONTENT_SETTING_ASK,

- profile()->GetHostContentSettingsMap()->GetContentSetting(

- insecure_url.GetOrigin(), secure_url.GetOrigin(),

- CONTENT_SETTINGS_TYPE_MIDI_SYSEX, std::string()));

+ HostContentSettingsMapFactory::GetForProfile(profile())

+ ->GetContentSetting(insecure_url.GetOrigin(),

+ secure_url.GetOrigin(),

+ CONTENT_SETTINGS_TYPE_MIDI_SYSEX,

+ std::string()));

EXPECT_EQ(CONTENT_SETTING_BLOCK, permission_context.GetPermissionStatus(

insecure_url, insecure_url));