Chromium Code Reviews| Index: chrome/browser/notifications/notification_permission_context_unittest.cc |
| diff --git a/chrome/browser/notifications/notification_permission_context_unittest.cc b/chrome/browser/notifications/notification_permission_context_unittest.cc |
| index 778b6f109fe873d4bf4de277e18517c808756502..e72a6ddaee45b5d69b803d1599e0ed5cec489743 100644 |
| --- a/chrome/browser/notifications/notification_permission_context_unittest.cc |
| +++ b/chrome/browser/notifications/notification_permission_context_unittest.cc |
| @@ -5,25 +5,82 @@ |
| #include "chrome/browser/notifications/notification_permission_context.h" |
| #include "base/bind.h" |
| +#include "base/message_loop/message_loop.h" |
| +#include "base/test/test_mock_time_task_runner.h" |
| +#include "base/time/time.h" |
| +#include "chrome/browser/content_settings/host_content_settings_map_factory.h" |
| #include "chrome/browser/notifications/desktop_notification_profile_util.h" |
| +#include "chrome/browser/permissions/permission_request_id.h" |
| #include "chrome/browser/profiles/profile.h" |
| +#include "chrome/test/base/chrome_render_view_host_test_harness.h" |
| #include "chrome/test/base/testing_profile.h" |
| #include "components/content_settings/core/browser/host_content_settings_map.h" |
| +#include "content/public/browser/render_process_host.h" |
| +#include "content/public/browser/web_contents.h" |
| #include "content/public/test/test_browser_thread_bundle.h" |
| #include "testing/gtest/include/gtest/gtest.h" |
| #include "url/gurl.h" |
| +namespace { |
| + |
| +void DoNothing(ContentSetting content_setting) {} |
| + |
| +class TestNotificationPermissionContext : public NotificationPermissionContext { |
| + public: |
| + explicit TestNotificationPermissionContext(Profile* profile) |
| + : NotificationPermissionContext(profile), |
| + permission_set_count_(0), |
| + last_permission_set_persisted_(false), |
| + last_permission_set_setting_(CONTENT_SETTING_DEFAULT) {} |
| + |
| + int permission_set_count() const { return permission_set_count_; } |
| + bool last_permission_set_persisted() const { |
| + return last_permission_set_persisted_; |
| + } |
| + ContentSetting last_permission_set_setting() const { |
| + return last_permission_set_setting_; |
| + } |
| + |
| + ContentSetting GetContentSettingFromMap(GURL url_a, GURL url_b) { |
|
Peter Beverloo
2016/01/13 01:42:10
const GURL&
johnme
2016/01/13 20:49:26
Done.
|
| + return HostContentSettingsMapFactory::GetForProfile(profile()) |
| + ->GetContentSetting(url_a.GetOrigin(), url_b.GetOrigin(), |
| + content_settings_type(), std::string()); |
| + } |
| + |
| + private: |
| + // NotificationPermissionContext: |
| + void NotifyPermissionSet(const PermissionRequestID& id, |
| + const GURL& requesting_origin, |
| + const GURL& embedder_origin, |
| + const BrowserPermissionCallback& callback, |
| + bool persist, |
| + ContentSetting content_setting) override { |
| + permission_set_count_++; |
| + last_permission_set_persisted_ = persist; |
| + last_permission_set_setting_ = content_setting; |
| + NotificationPermissionContext::NotifyPermissionSet( |
| + id, requesting_origin, embedder_origin, callback, persist, |
| + content_setting); |
| + } |
| + |
| + int permission_set_count_; |
| + bool last_permission_set_persisted_; |
| + ContentSetting last_permission_set_setting_; |
| +}; |
| + |
| +class NotificationPermissionContextTest |
| + : public ChromeRenderViewHostTestHarness {}; |
| + |
| +} // namespace |
| + |
| // Web Notification permission requests will completely ignore the embedder |
| // origin. See https://crbug.com/416894. |
| -TEST(NotificationPermissionContextTest, IgnoresEmbedderOrigin) { |
| - content::TestBrowserThreadBundle thread_bundle; |
| - TestingProfile profile; |
| - |
| +TEST_F(NotificationPermissionContextTest, IgnoresEmbedderOrigin) { |
| GURL requesting_origin("https://example.com"); |
| GURL embedding_origin("https://chrome.com"); |
| GURL different_origin("https://foobar.com"); |
| - NotificationPermissionContext context(&profile); |
| + NotificationPermissionContext context(profile()); |
| context.UpdateContentSetting(requesting_origin, |
| embedding_origin, |
| CONTENT_SETTING_ALLOW); |
| @@ -45,13 +102,10 @@ TEST(NotificationPermissionContextTest, IgnoresEmbedderOrigin) { |
| // Web Notifications do not require a secure origin when requesting permission. |
| // See https://crbug.com/404095. |
| -TEST(NotificationPermissionContextTest, NoSecureOriginRequirement) { |
| - content::TestBrowserThreadBundle thread_bundle; |
| - TestingProfile profile; |
| - |
| +TEST_F(NotificationPermissionContextTest, NoSecureOriginRequirement) { |
| GURL origin("http://example.com"); |
| - NotificationPermissionContext context(&profile); |
| + NotificationPermissionContext context(profile()); |
| EXPECT_EQ(CONTENT_SETTING_ASK, |
| context.GetPermissionStatus(origin, origin)); |
| @@ -60,3 +114,76 @@ TEST(NotificationPermissionContextTest, NoSecureOriginRequirement) { |
| EXPECT_EQ(CONTENT_SETTING_ALLOW, |
| context.GetPermissionStatus(origin, origin)); |
| } |
| + |
| +// Tests auto-denial after a time delay in incognito. |
| +TEST_F(NotificationPermissionContextTest, TestDenyInIncognitoAfterDelay) { |
| + TestNotificationPermissionContext permission_context( |
| + profile()->GetOffTheRecordProfile()); |
| + GURL url("https://www.example.com"); |
| + NavigateAndCommit(url); |
| + |
| + const PermissionRequestID id(web_contents()->GetRenderProcessHost()->GetID(), |
| + web_contents()->GetMainFrame()->GetRoutingID(), |
| + -1); |
| + |
| + scoped_refptr<base::SingleThreadTaskRunner> old_task_runner( |
| + base::MessageLoop::current()->task_runner()); |
| + scoped_refptr<base::TestMockTimeTaskRunner> task_runner( |
| + new base::TestMockTimeTaskRunner(base::Time::Now(), |
| + base::TimeTicks::Now())); |
| + base::MessageLoop::current()->SetTaskRunner(task_runner); |
| + |
| + ASSERT_EQ(0, permission_context.permission_set_count()); |
| + ASSERT_FALSE(permission_context.last_permission_set_persisted()); |
| + ASSERT_EQ(CONTENT_SETTING_DEFAULT, |
| + permission_context.last_permission_set_setting()); |
| + |
| + permission_context.RequestPermission( |
| + web_contents(), id, url, true /* user_gesture */, base::Bind(&DoNothing)); |
| + |
| + // Should be blocked after 1-2 seconds, but the timer is reset whenever the |
| + // tab is not visible, so these 500ms never add up to >= 1 second. |
| + for (int n = 0; n < 10; n++) { |
| + web_contents()->WasShown(); |
| + task_runner->FastForwardBy(base::TimeDelta::FromMilliseconds(500)); |
| + web_contents()->WasHidden(); |
| + } |
| + |
| + EXPECT_EQ(0, permission_context.permission_set_count()); |
| + EXPECT_EQ(CONTENT_SETTING_ASK, |
| + permission_context.GetContentSettingFromMap(url, url)); |
| + |
| + // Time elapsed whilst hidden is not counted. |
| + // n.b. This line also clears out any old scheduled timer tasks. This is |
| + // important, because otherwise Timer::Reset (triggered by |
| + // VisibilityTimerTabHelper::WasShown) may choose to re-use an existing |
| + // scheduled task, and when it fires Timer::RunScheduledTask will call |
| + // TimeTicks::Now() (which unlike task_runner->NowTicks(), we can't fake), |
| + // and miscalculate the remaining delay at which to fire the timer. |
| + task_runner->FastForwardBy(base::TimeDelta::FromDays(1)); |
| + |
| + EXPECT_EQ(0, permission_context.permission_set_count()); |
| + EXPECT_EQ(CONTENT_SETTING_ASK, |
| + permission_context.GetContentSettingFromMap(url, url)); |
| + |
| + // Should be blocked after 1-2 seconds. So 500ms is not enough. |
| + web_contents()->WasShown(); |
| + task_runner->FastForwardBy(base::TimeDelta::FromMilliseconds(500)); |
| + |
| + EXPECT_EQ(0, permission_context.permission_set_count()); |
| + EXPECT_EQ(CONTENT_SETTING_ASK, |
| + permission_context.GetContentSettingFromMap(url, url)); |
| + |
| + // But 5*500ms > 2 seconds, so it should now be blocked. |
| + for (int n = 0; n < 4; n++) |
| + task_runner->FastForwardBy(base::TimeDelta::FromMilliseconds(500)); |
|
Peter Beverloo
2016/01/13 01:42:10
This test is testing three things:
(1) Resetti
johnme
2016/01/13 20:49:26
I kept 1,2,3 together, as splitting it up would ca
|
| + |
| + EXPECT_EQ(1, permission_context.permission_set_count()); |
| + EXPECT_TRUE(permission_context.last_permission_set_persisted()); |
| + EXPECT_EQ(CONTENT_SETTING_BLOCK, |
| + permission_context.last_permission_set_setting()); |
| + EXPECT_EQ(CONTENT_SETTING_BLOCK, |
| + permission_context.GetContentSettingFromMap(url, url)); |
| + |
| + base::MessageLoop::current()->SetTaskRunner(old_task_runner); |
| +} |