chrome/browser/notifications/platform_notification_service_unittest.cc - Issue 1312453005: Removed Profile::GetHostContentSettingsMap

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/notifications/platform_notification_service_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/notifications/platform_notification_service_impl.cc ('k') | chrome/browser/pepper_broker_infobar_delegate.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/notifications/platform_notification_service_unittest.cc

diff --git a/chrome/browser/notifications/platform_notification_service_unittest.cc b/chrome/browser/notifications/platform_notification_service_unittest.cc

index b4eb2a78528a4e2627148b446c131a4be1125ca2..1a80cb4325234d37a3557f14181fb5fdc6974b41 100644

--- a/chrome/browser/notifications/platform_notification_service_unittest.cc

+++ b/chrome/browser/notifications/platform_notification_service_unittest.cc

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

#include "base/strings/utf_string_conversions.h"

#include "base/threading/platform_thread.h"

#include "base/time/time.h"

+#include "chrome/browser/content_settings/host_content_settings_map_factory.h"

#include "chrome/browser/notifications/notification_delegate.h"

#include "chrome/browser/notifications/notification_test_util.h"

#include "chrome/browser/notifications/platform_notification_service_impl.h"

@@ -230,7 +231,7 @@ TEST_F(PlatformNotificationServiceTest, NotificationPermissionLastUsage) {

CreateSimplePageNotification();

base::Time after_page_notification =

- profile()->GetHostContentSettingsMap()->GetLastUsage(

+ HostContentSettingsMapFactory::GetForProfile(profile())->GetLastUsage(

origin, origin, CONTENT_SETTINGS_TYPE_NOTIFICATIONS);

EXPECT_GT(after_page_notification, begin_time);

@@ -242,7 +243,7 @@ TEST_F(PlatformNotificationServiceTest, NotificationPermissionLastUsage) {

content::PlatformNotificationData());

base::Time after_persistent_notification =

- profile()->GetHostContentSettingsMap()->GetLastUsage(

+ HostContentSettingsMapFactory::GetForProfile(profile())->GetLastUsage(

origin, origin, CONTENT_SETTINGS_TYPE_NOTIFICATIONS);

EXPECT_GT(after_persistent_notification, after_page_notification);

}