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

Unified Diff: chrome/browser/permissions/permission_manager_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_manager_unittest.cc
diff --git a/chrome/browser/permissions/permission_manager_unittest.cc b/chrome/browser/permissions/permission_manager_unittest.cc
index 28dc217d470999b6b4ba5f40d7439f18932ba2ce..ab5561f20a278c33208ae4afeb94afd79b64c215 100644
--- a/chrome/browser/permissions/permission_manager_unittest.cc
+++ b/chrome/browser/permissions/permission_manager_unittest.cc
@@ -4,6 +4,7 @@
#include "chrome/browser/permissions/permission_manager.h"
+#include "chrome/browser/content_settings/host_content_settings_map_factory.h"
#include "chrome/browser/permissions/permission_manager_factory.h"
#include "chrome/test/base/testing_profile.h"
#include "components/content_settings/core/browser/host_content_settings_map.h"
@@ -50,7 +51,7 @@ class PermissionManagerTest : public testing::Test {
}
HostContentSettingsMap* GetHostContentSettingsMap() {
- return profile_.GetHostContentSettingsMap();
+ return HostContentSettingsMapFactory::GetForProfile(&profile_);
}
void CheckPermissionStatus(PermissionType type,
@@ -60,7 +61,7 @@ class PermissionManagerTest : public testing::Test {
}
void SetPermission(ContentSettingsType type, ContentSetting value) {
- profile_.GetHostContentSettingsMap()->SetContentSetting(
+ HostContentSettingsMapFactory::GetForProfile(&profile_)->SetContentSetting(
ContentSettingsPattern::FromURLNoWildcard(url_),
ContentSettingsPattern::FromURLNoWildcard(url_),
type, std::string(), value);
« no previous file with comments | « chrome/browser/permissions/permission_manager_factory.cc ('k') | chrome/browser/permissions/permission_queue_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698