Add related_applications field to manifest parser.

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_number_conversions.h"
 #include "base/strings/string_split.h"
@@ skipping 109 matching lines @@
     return;
   }
   DCHECK(dictionary);
 
   manifest_.name = ParseName(*dictionary);
   manifest_.short_name = ParseShortName(*dictionary);
   manifest_.start_url = ParseStartURL(*dictionary);
   manifest_.display = ParseDisplay(*dictionary);
   manifest_.orientation = ParseOrientation(*dictionary);
   manifest_.icons = ParseIcons(*dictionary);
+  manifest_.related_applications = ParseRelatedApplications(*dictionary);
+  manifest_.prefer_related_applications =
+      ParsePreferRelatedApplications(*dictionary);
   manifest_.gcm_sender_id = ParseGCMSenderID(*dictionary);
   manifest_.gcm_user_visible_only = ParseGCMUserVisibleOnly(*dictionary);
 
   ManifestUmaUtil::ParseSucceeded(manifest_);
 }
 
 const Manifest& ManifestParser::manifest() const {
   return manifest_;
 }
 
@@ skipping 187 matching lines @@
     icon.type = ParseIconType(*icon_dictionary);
     icon.density = ParseIconDensity(*icon_dictionary);
     icon.sizes = ParseIconSizes(*icon_dictionary);
 
     icons.push_back(icon);
   }
 
   return icons;
 }
 
+Manifest::RelatedApplicationPlatform
+ManifestParser::ParseRelatedApplicationPlatform(
+    const base::DictionaryValue& application) {
+  base::NullableString16 platform = ParseString(application, "platform", Trim);
+  if (platform.is_null()) {
+    errors_.push_back(GetErrorPrefix() + "'platform' is a required field, "
+                      "related application ignored.");
+    return Manifest::RELATED_APPLICATION_PLATFORM_UNSPECIFIED;
+  }
+
+  if (LowerCaseEqualsASCII(platform.string(), "play"))
+    return Manifest::RELATED_APPLICATION_PLATFORM_PLAY;
+  else {
+    errors_.push_back(GetErrorPrefix() + "unknown 'platform' value ignored.");
+    return Manifest::RELATED_APPLICATION_PLATFORM_UNSPECIFIED;
+  }
+}

[mlamouri (slow - plz ping), 2015/04/10 09:49:45]

I would do:
  return ParseString(application, "platform", Trim);

then in the |ParseRelatedApplications| check if it's not null.

[benwells, 2015/04/15 06:45:22]

Done.

+
+GURL ManifestParser::ParseRelatedApplicationURL(
+    const base::DictionaryValue& application) {
+  return ParseURL(application, "url", manifest_url_);
+}
+
+base::NullableString16 ManifestParser::ParseRelatedApplicationId(
+    const base::DictionaryValue& application) {
+  return ParseString(application, "id", Trim);
+}
+
+std::vector<Manifest::RelatedApplication>
+ManifestParser::ParseRelatedApplications(
+    const base::DictionaryValue& dictionary) {
+  std::vector<Manifest::RelatedApplication> applications;
+  if (!dictionary.HasKey("related_applications"))
+    return applications;
+
+  const base::ListValue* applications_list = nullptr;
+  if (!dictionary.GetList("related_applications", &applications_list)) {
+    errors_.push_back(
+        GetErrorPrefix() +
+        "property 'related_applications' ignored, type array expected.");
+    return applications;
+  }
+
+  for (size_t i = 0; i < applications_list->GetSize(); ++i) {
+    const base::DictionaryValue* application_dictionary = nullptr;
+    if (!applications_list->GetDictionary(i, &application_dictionary))
+      continue;
+
+    Manifest::RelatedApplication application;
+    application.platform =
+        ParseRelatedApplicationPlatform(*application_dictionary);
+    // "If platform is undefined, move onto the next item if any are left."
+    // No error needs to be reported here, as it will have been reported in
+    // ParseRelatedApplicationPlatform.
+    if (application.platform ==
+        Manifest::RELATED_APPLICATION_PLATFORM_UNSPECIFIED) {
+      continue;
+    }
+
+    application.id = ParseRelatedApplicationId(*application_dictionary);
+    application.url = ParseRelatedApplicationURL(*application_dictionary);
+    // "If both id and url are undefined, move onto the next item if any are
+    // left."
+    if (application.url.is_empty() && application.id.is_null()) {
+      errors_.push_back(
+          GetErrorPrefix() +
+          "one of 'url' or 'id' is required, related application ignored.");
+      continue;
+    }
+
+    applications.push_back(application);
+  }
+
+  return applications;
+}
+
+bool ManifestParser::ParsePreferRelatedApplications(
+    const base::DictionaryValue& dictionary) {
+  return ParseBoolean(dictionary, "prefer_related_applications", false);
+}
+
 base::NullableString16 ManifestParser::ParseGCMSenderID(
     const base::DictionaryValue& dictionary)  {
   return ParseString(dictionary, "gcm_sender_id", Trim);
 }
 
 bool ManifestParser::ParseGCMUserVisibleOnly(
     const base::DictionaryValue& dictionary) {
   return ParseBoolean(dictionary, "gcm_user_visible_only", false);
 }
 
 } // namespace content