[Push] Register: require user-visible to be present in the manifest

chrome/browser/content_settings/permission_context_base_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/content_settings/permission_context_base.h"
 
 #include "base/bind.h"
 #include "chrome/browser/content_settings/permission_queue_controller.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
@@ skipping 64 matching lines @@
  private:
    bool permission_set_;
    bool permission_granted_;
    bool tab_context_updated_;
 };
 
 // Simulates clicking Accept. The permission should be granted and
 // saved for future use.
 TEST_F(PermissionContextBaseTests, TestAskAndGrant) {
   TestPermissionContext permission_context(profile(),
-                      CONTENT_SETTINGS_TYPE_PUSH_MESSAGING);
+                      CONTENT_SETTINGS_TYPE_NOTIFICATIONS);
   GURL url("http://www.google.com");
   content::WebContentsTester::For(web_contents())->NavigateAndCommit(url);
 
   const PermissionRequestID id(
       web_contents()->GetRenderProcessHost()->GetID(),
       web_contents()->GetRenderViewHost()->GetRoutingID(),
       -1, GURL());
   permission_context.RequestPermission(
       web_contents(),
       id, url, true,
       base::Bind(&TestPermissionContext::TrackPermissionDecision,
                  base::Unretained(&permission_context)));
 
   permission_context.GetInfoBarController()->OnPermissionSet(
       id, url, url, true, true);
   EXPECT_TRUE(permission_context.permission_set());
   EXPECT_TRUE(permission_context.permission_granted());
   EXPECT_TRUE(permission_context.tab_context_updated());
 
   ContentSetting setting =
       profile()->GetHostContentSettingsMap()->GetContentSetting(
           url.GetOrigin(), url.GetOrigin(),
-          CONTENT_SETTINGS_TYPE_PUSH_MESSAGING, std::string());
+          CONTENT_SETTINGS_TYPE_NOTIFICATIONS, std::string());
   EXPECT_EQ(CONTENT_SETTING_ALLOW , setting);
 };
 
 // Simulates clicking Dismiss (X in the infobar.
 // The permission should be denied but not saved for future use.
 TEST_F(PermissionContextBaseTests, TestAskAndDismiss) {
   TestPermissionContext permission_context(profile(),
                       CONTENT_SETTINGS_TYPE_MIDI_SYSEX);
   GURL url("http://www.google.es");
   content::WebContentsTester::For(web_contents())->NavigateAndCommit(url);
@@ skipping 13 matching lines @@
   EXPECT_TRUE(permission_context.permission_set());
   EXPECT_FALSE(permission_context.permission_granted());
   EXPECT_TRUE(permission_context.tab_context_updated());
 
   ContentSetting setting =
       profile()->GetHostContentSettingsMap()->GetContentSetting(
           url.GetOrigin(), url.GetOrigin(),
           CONTENT_SETTINGS_TYPE_MIDI_SYSEX, std::string());
   EXPECT_EQ(CONTENT_SETTING_ASK , setting);
 };