Push registration should read a "gcm_user_visible_only" key from the Manifest.

content/renderer/manifest/manifest_parser_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 "content/renderer/manifest/manifest_parser.h"
 
 #include "base/strings/string_util.h"
 #include "content/public/common/manifest.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ skipping 48 matching lines @@
   EXPECT_EQ("Manifest parsing error: Line: 1, column: 1, Unexpected token.",
             errors()[0]);
 
   // A parsing error is equivalent to an empty manifest.
   ASSERT_TRUE(manifest.IsEmpty());
   ASSERT_TRUE(manifest.name.is_null());
   ASSERT_TRUE(manifest.short_name.is_null());
   ASSERT_TRUE(manifest.start_url.is_empty());
   ASSERT_EQ(manifest.display, Manifest::DISPLAY_MODE_UNSPECIFIED);
   ASSERT_EQ(manifest.orientation, blink::WebScreenOrientationLockDefault);
+  ASSERT_TRUE(manifest.gcm_sender_id.is_null());
+  ASSERT_TRUE(manifest.gcm_user_visible_only);
 }
 
 TEST_F(ManifestParserTest, ValidNoContentParses) {
   Manifest manifest = ParseManifest("{}");
 
   // Empty Manifest is not a parsing error.
   EXPECT_EQ(0u, GetErrorCount());
 
   // Check that all the fields are null in that case.
   ASSERT_TRUE(manifest.IsEmpty());
   ASSERT_TRUE(manifest.name.is_null());
   ASSERT_TRUE(manifest.short_name.is_null());
   ASSERT_TRUE(manifest.start_url.is_empty());
   ASSERT_EQ(manifest.display, Manifest::DISPLAY_MODE_UNSPECIFIED);
   ASSERT_EQ(manifest.orientation, blink::WebScreenOrientationLockDefault);
+  ASSERT_TRUE(manifest.gcm_sender_id.is_null());
+  ASSERT_TRUE(manifest.gcm_user_visible_only);
 }
 
 TEST_F(ManifestParserTest, MultipleErrorsReporting) {
   Manifest manifest = ParseManifest("{ \"name\": 42, \"short_name\": 4,"
       "\"orientation\": {}, \"display\": \"foo\", \"start_url\": null,"
-      "\"icons\": {} }");
+      "\"icons\": {}, \"gcm_user_visible_only\": 42 }");
 
-  EXPECT_EQ(6u, GetErrorCount());
+  EXPECT_EQ(7u, GetErrorCount());
 
   EXPECT_EQ("Manifest parsing error: property 'name' ignored,"
             " type string expected.",
             errors()[0]);
   EXPECT_EQ("Manifest parsing error: property 'short_name' ignored,"
             " type string expected.",
             errors()[1]);
   EXPECT_EQ("Manifest parsing error: property 'start_url' ignored,"
             " type string expected.",
             errors()[2]);
   EXPECT_EQ("Manifest parsing error: unknown 'display' value ignored.",
             errors()[3]);
   EXPECT_EQ("Manifest parsing error: property 'orientation' ignored,"
             " type string expected.",
             errors()[4]);
   EXPECT_EQ("Manifest parsing error: property 'icons' ignored, "
             "type array expected.",
             errors()[5]);
+  EXPECT_EQ("Manifest parsing error: property 'gcm_user_visible_only' ignored, "
+            "type boolean expected.",
+            errors()[6]);
 }
 
 TEST_F(ManifestParserTest, NameParseRules) {
   // Smoke test.
   {
     Manifest manifest = ParseManifest("{ \"name\": \"foo\" }");
     ASSERT_TRUE(EqualsASCII(manifest.name.string(), "foo"));
     ASSERT_FALSE(manifest.IsEmpty());
     EXPECT_EQ(0u, GetErrorCount());
   }
@@ skipping 666 matching lines @@
     EXPECT_EQ(0u, GetErrorCount());
   }
 
   // Trim whitespaces.
   {
     Manifest manifest = ParseManifest("{ \"gcm_sender_id\": \"  foo  \" }");
     EXPECT_TRUE(EqualsASCII(manifest.gcm_sender_id.string(), "foo"));
     EXPECT_EQ(0u, GetErrorCount());
   }
 
-  // Don't parse if property isn't a string.
+  // Don't parse if the property isn't a string.
   {
     Manifest manifest = ParseManifest("{ \"gcm_sender_id\": {} }");
     EXPECT_TRUE(manifest.gcm_sender_id.is_null());
     EXPECT_EQ(1u, GetErrorCount());
     EXPECT_EQ("Manifest parsing error: property 'gcm_sender_id' ignored,"
               " type string expected.",
               errors()[0]);
   }
   {
     Manifest manifest = ParseManifest("{ \"gcm_sender_id\": 42 }");
     EXPECT_TRUE(manifest.gcm_sender_id.is_null());
     EXPECT_EQ(1u, GetErrorCount());
     EXPECT_EQ("Manifest parsing error: property 'gcm_sender_id' ignored,"
               " type string expected.",
               errors()[0]);
   }
 }
 
+TEST_F(ManifestParserTest, GCMUserVisibleOnlyParseRules) {
+  // Smoke test.
+  {
+    Manifest manifest = ParseManifest("{ \"gcm_user_visible_only\": true }");
+    EXPECT_TRUE(manifest.gcm_user_visible_only);
+    EXPECT_EQ(0u, GetErrorCount());
+  }
+
+  // Don't parse if the property isn't a boolean.
+  {
+    Manifest manifest = ParseManifest("{ \"gcm_user_visible_only\": {} }");
+    EXPECT_FALSE(manifest.gcm_user_visible_only);
+    EXPECT_EQ(1u, GetErrorCount());
+    EXPECT_EQ(
+        "Manifest parsing error: property 'gcm_user_visible_only' ignored,"
+            " type boolean expected.",
+        errors()[0]);
+  }
+  {
+    Manifest manifest = ParseManifest(
+        "{ \"gcm_user_visible_only\": \"true\" }");
+    EXPECT_FALSE(manifest.gcm_user_visible_only);
+    EXPECT_EQ(1u, GetErrorCount());
+    EXPECT_EQ(
+        "Manifest parsing error: property 'gcm_user_visible_only' ignored,"
+            " type boolean expected.",
+        errors()[0]);
+  }

[mlamouri (slow - plz ping), 2014/12/01 21:05:09]

Could you check that false is correctly parsed without parsing error.

[Peter Beverloo, 2014/12/03 15:01:59]

Done.

+}
+
 } // namespace content