Add support for gcm_sender_id in Manifest.

content/renderer/manifest/manifest_parser.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/json/json_reader.h"
 #include "base/strings/nullable_string16.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "content/public/common/manifest.h"
+#include "third_party/WebKit/public/web/WebRuntimeFeatures.h"
 
 namespace {
 
 // Parses the 'name' field of the manifest, as defined in:
 // http://w3c.github.io/manifest/#dfn-steps-for-processing-the-name-member
 // Returns the parsed string if any, a null string if the parsing failed.
 base::NullableString16 ParseName(const base::DictionaryValue& dictionary)  {
   if (!dictionary.HasKey("name"))
     return base::NullableString16();
 
@@ skipping 45 matching lines @@
     return GURL();
 
   if (start_url.GetOrigin() != document_url.GetOrigin()) {
     // TODO(mlamouri): provide a custom message to the developer console.
     return GURL();
   }
 
   return start_url;
 }
 
+// Parses the 'gcm_sender_id' field of the manifest.
+// This is a proprietary extension that we only use when PushMessaging is
+// enabled in Blink.
+// Returns the parsed string if any, a null string if the parsing failed.
+base::NullableString16 ParseGCMSenderID(
+    const base::DictionaryValue& dictionary)  {

[Mike West, 2014/09/17 04:20:52]

Can you add an ASSERT that the runtime flag isn't enabled?

[mlamouri (slow - plz ping), 2014/09/17 08:35:41]

Done.

+  if (!dictionary.HasKey("gcm_sender_id"))
+    return base::NullableString16();
+
+  base::string16 gcm_sender_id;
+  if (!dictionary.GetString("gcm_sender_id", &gcm_sender_id)) {
+    // TODO(mlamouri): provide a custom message to the developer console.
+    return base::NullableString16();
+  }
+
+  base::TrimWhitespace(gcm_sender_id, base::TRIM_ALL, &gcm_sender_id);
+  return base::NullableString16(gcm_sender_id, false);
+}
+
 } // anonymous namespace
 
 namespace content {
 
 Manifest ManifestParser::Parse(const base::StringPiece& json,
                                const GURL& manifest_url,
                                const GURL& document_url) {
   scoped_ptr<base::Value> value(base::JSONReader::Read(json));
   if (!value) {
     // TODO(mlamouri): get the JSON parsing error and report it to the developer
@@ skipping 12 matching lines @@
     // TODO(mlamouri): provide a custom message to the developer console.
     return Manifest();
   }
 
   Manifest manifest;
 
   manifest.name = ParseName(*dictionary);
   manifest.short_name = ParseShortName(*dictionary);
   manifest.start_url = ParseStartURL(*dictionary, manifest_url, document_url);
 
+  if (blink::WebRuntimeFeatures::isPushMessagingEnabled())
+    manifest.gcm_sender_id = ParseGCMSenderID(*dictionary);
+
   return manifest;
 }
 
 } // namespace content