Reintroduce plumbing for user gesture into permission system.

chrome/browser/push_messaging/push_messaging_permission_context_unittest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/push_messaging/push_messaging_permission_context.h"
 
 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
 #include "chrome/browser/permissions/permission_request_id.h"
 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
 #include "chrome/test/base/testing_profile.h"
@@ skipping 184 matching lines @@
 }
 
 TEST_F(PushMessagingPermissionContextTest, DecidePermission) {
   TestingProfile profile;
   TestPushMessagingPermissionContext context(&profile);
   PermissionRequestID request_id(-1, -1, -1);
   BrowserPermissionCallback callback = base::Bind(DoNothing);
 
   // Requesting and embedding origin are different.
   context.DecidePermission(NULL, request_id, GURL(kOriginA), GURL(kOriginB),
-                           callback);
+                           true /* user_gesture */, callback);
   EXPECT_FALSE(context.was_persisted());
   EXPECT_FALSE(context.was_granted());
 
   // Insecure origin
   NavigateAndCommit(GURL(kInsecureOrigin));
   context.RequestPermission(web_contents(), request_id, GURL(kInsecureOrigin),
-                            callback);
+                            true /* user_gesture */, callback);
   EXPECT_FALSE(context.was_persisted());
   EXPECT_FALSE(context.was_granted());
 }
 
 TEST_F(PushMessagingPermissionContextTest, RequestPermission) {
   TestingProfile profile;
   TestPushMessagingPermissionContext context(&profile);
   PermissionRequestID request_id(-1, -1, -1);
   BrowserPermissionCallback callback = base::Bind(DoNothing);
 
   SetContentSetting(&profile, CONTENT_SETTINGS_TYPE_NOTIFICATIONS,
                     CONTENT_SETTING_ALLOW);
 
   EXPECT_EQ(
       CONTENT_SETTING_ASK,
       HostContentSettingsMapFactory::GetForProfile(&profile)->GetContentSetting(
           GURL(kOriginA), GURL(kOriginA), CONTENT_SETTINGS_TYPE_PUSH_MESSAGING,
           std::string()));
   EXPECT_EQ(CONTENT_SETTING_ALLOW,
             context.GetPermissionStatus(GURL(kOriginA), GURL(kOriginA)));
 
   // If a website already has notifications permission, push permission is
   // silently assumed to be granted.
   NavigateAndCommit(GURL(kOriginA));
   context.RequestPermission(web_contents(), request_id, GURL(kOriginA),
-                            callback);
+                            true /* user_gesture */, callback);
 
   // Although the permission check goes through, the push message permission
   // isn't actually updated.
   EXPECT_TRUE(context.was_granted());
   EXPECT_EQ(
       CONTENT_SETTING_ASK,
       HostContentSettingsMapFactory::GetForProfile(&profile)->GetContentSetting(
           GURL(kOriginA), GURL(kOriginA), CONTENT_SETTINGS_TYPE_PUSH_MESSAGING,
           std::string()));
   EXPECT_EQ(CONTENT_SETTING_ALLOW,
             context.GetPermissionStatus(GURL(kOriginA), GURL(kOriginA)));
 }
 
 TEST_F(PushMessagingPermissionContextTest, RequestAfterRevokingNotifications) {
   TestingProfile profile;
   TestPushMessagingPermissionContext context(&profile);
   PermissionRequestID request_id(-1, -1, -1);
   BrowserPermissionCallback callback = base::Bind(DoNothing);
 
   SetContentSetting(&profile, CONTENT_SETTINGS_TYPE_NOTIFICATIONS,
                     CONTENT_SETTING_ALLOW);
 
   NavigateAndCommit(GURL(kOriginA));
   context.RequestPermission(web_contents(), request_id, GURL(kOriginA),
-                            callback);
+                            true /* user_gesture */, callback);
   EXPECT_TRUE(context.was_granted());
 
   EXPECT_EQ(CONTENT_SETTING_ALLOW,
             context.GetPermissionStatus(GURL(kOriginA), GURL(kOriginA)));
 
   // Revoke notifications permission. This should revoke push, and prevent
   // future requests for push from succeeding.
   SetContentSetting(&profile, CONTENT_SETTINGS_TYPE_NOTIFICATIONS,
                     CONTENT_SETTING_BLOCK);
 
   EXPECT_EQ(CONTENT_SETTING_BLOCK,
             context.GetPermissionStatus(GURL(kOriginA), GURL(kOriginA)));
 
   context.RequestPermission(web_contents(), request_id, GURL(kOriginA),
-                            callback);
+                            true /* user_gesture */, callback);
   EXPECT_FALSE(context.was_persisted());
   EXPECT_FALSE(context.was_granted());
   EXPECT_EQ(CONTENT_SETTING_BLOCK,
             context.GetPermissionStatus(GURL(kOriginA), GURL(kOriginA)));
 }
 
 TEST_F(PushMessagingPermissionContextTest, GetPermissionStatusInsecureOrigin) {
   TestingProfile profile;
   TestPushMessagingPermissionContext context(&profile);
 
@@ skipping 16 matching lines @@
   EXPECT_EQ(CONTENT_SETTING_BLOCK,
             context.GetPermissionStatus(GURL(kInsecureOrigin),
                                         GURL(kInsecureOrigin)));
 
   SetContentSetting(&profile, CONTENT_SETTINGS_TYPE_PUSH_MESSAGING,
                     CONTENT_SETTING_ASK);
   EXPECT_EQ(CONTENT_SETTING_BLOCK,
             context.GetPermissionStatus(GURL(kInsecureOrigin),
                                         GURL(kInsecureOrigin)));
 }