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

Unified Diff: chrome/browser/media/media_stream_device_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
Index: chrome/browser/media/media_stream_device_permission_context_unittest.cc
diff --git a/chrome/browser/media/media_stream_device_permission_context_unittest.cc b/chrome/browser/media/media_stream_device_permission_context_unittest.cc
index b379446356be8a8f29f310e0cfea3d0dc4c8aca3..3fd8927661e01d5202a8085ab699a903c2d0ae15 100644
--- a/chrome/browser/media/media_stream_device_permission_context_unittest.cc
+++ b/chrome/browser/media/media_stream_device_permission_context_unittest.cc
@@ -5,6 +5,7 @@
#include "chrome/browser/media/media_stream_device_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"
@@ -45,17 +46,23 @@ class MediaStreamDevicePermissionContextTests
// Check that there is no saved content settings.
EXPECT_EQ(CONTENT_SETTING_ASK,
- profile()->GetHostContentSettingsMap()->GetContentSetting(
- insecure_url.GetOrigin(), insecure_url.GetOrigin(),
- permission_type, std::string()));
+ HostContentSettingsMapFactory::GetForProfile(profile())
+ ->GetContentSetting(insecure_url.GetOrigin(),
+ insecure_url.GetOrigin(),
+ permission_type,
+ std::string()));
EXPECT_EQ(CONTENT_SETTING_ASK,
- profile()->GetHostContentSettingsMap()->GetContentSetting(
- secure_url.GetOrigin(), insecure_url.GetOrigin(),
- permission_type, std::string()));
+ HostContentSettingsMapFactory::GetForProfile(profile())
+ ->GetContentSetting(secure_url.GetOrigin(),
+ insecure_url.GetOrigin(),
+ permission_type,
+ std::string()));
EXPECT_EQ(CONTENT_SETTING_ASK,
- profile()->GetHostContentSettingsMap()->GetContentSetting(
- insecure_url.GetOrigin(), secure_url.GetOrigin(),
- permission_type, std::string()));
+ HostContentSettingsMapFactory::GetForProfile(profile())
+ ->GetContentSetting(insecure_url.GetOrigin(),
+ secure_url.GetOrigin(),
+ permission_type,
+ std::string()));
EXPECT_EQ(CONTENT_SETTING_ASK, permission_context.GetPermissionStatus(
insecure_url, insecure_url));
@@ -69,9 +76,11 @@ class MediaStreamDevicePermissionContextTests
// Check that there is no saved content settings.
EXPECT_EQ(CONTENT_SETTING_ASK,
- profile()->GetHostContentSettingsMap()->GetContentSetting(
- secure_url.GetOrigin(), secure_url.GetOrigin(),
- permission_type, std::string()));
+ HostContentSettingsMapFactory::GetForProfile(profile())
+ ->GetContentSetting(secure_url.GetOrigin(),
+ secure_url.GetOrigin(),
+ permission_type,
+ std::string()));
EXPECT_EQ(CONTENT_SETTING_ASK,
permission_context.GetPermissionStatus(secure_url, secure_url));

Powered by Google App Engine
This is Rietveld 408576698