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 111 matching lines @@
   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_.gcm_sender_id = ParseGCMSenderID(*dictionary);
   manifest_.gcm_user_visible_only = ParseGCMUserVisibleOnly(*dictionary);
+  manifest_.chrome_related_applications =
+      ParseChromeRelatedApplications(*dictionary);
 
   ManifestUmaUtil::ParseSucceeded(manifest_);
 }
 
 const Manifest& ManifestParser::manifest() const {
   return manifest_;
 }
 
 const std::vector<std::string>& ManifestParser::errors() const {
   return errors_;
@@ skipping 195 matching lines @@
 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);
 }
 
+Manifest::RelatedApplicationPlatform
+ManifestParser::ParseRelatedApplicationPlatform(
+    const base::DictionaryValue& application) {
+  base::NullableString16 display = ParseString(application, "platform", Trim);

[mlamouri (slow - plz ping), 2015/02/16 20:20:40]

s/display/platform/

[benwells, 2015/02/16 23:58:43]

Done.

+  if (display.is_null())
+    return Manifest::RELATED_APPLICATION_PLATFORM_UNSPECIFIED;

[mlamouri (slow - plz ping), 2015/02/16 20:20:39]

Could you add an error in that case? It seems that 'platform' is a requirement
here.

[benwells, 2015/02/16 23:58:43]

Done.

+
+  if (LowerCaseEqualsASCII(display.string(), "web"))
+    return Manifest::RELATED_APPLICATION_PLATFORM_WEB;
+  else if (LowerCaseEqualsASCII(display.string(), "android"))
+    return Manifest::RELATED_APPLICATION_PLATFORM_ANDROID;
+  else {
+    errors_.push_back(GetErrorPrefix() + "unknown 'platform' value ignored.");
+    return Manifest::RELATED_APPLICATION_PLATFORM_UNSPECIFIED;
+  }
+}
+
+base::NullableString16 ManifestParser::ParseRelatedApplicationId(
+    const base::DictionaryValue& application) {
+  return ParseString(application, "id", Trim);
+}
+
+std::vector<Manifest::RelatedApplication>
+ManifestParser::ParseChromeRelatedApplications(
+    const base::DictionaryValue& dictionary) {
+  std::vector<Manifest::RelatedApplication> applications;
+  if (!dictionary.HasKey("chrome_related_applications"))
+    return applications;
+
+  const base::ListValue* applications_list = nullptr;
+  if (!dictionary.GetList("chrome_related_applications", &applications_list)) {
+    errors_.push_back(
+        GetErrorPrefix() +
+        "property 'chrome_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);
+    // An application MUST have a valid platform. If it does not, it MUST be
+    // ignored.
+    if (application.platform ==
+        Manifest::RELATED_APPLICATION_PLATFORM_UNSPECIFIED)
+      continue;

[mlamouri (slow - plz ping), 2015/02/16 20:20:40]

Could you add a comment pointing that no error is required because
ParseRelatedApplicationPlatform() should have done that already?

+    application.id = ParseRelatedApplicationId(*application_dictionary);
+
+    applications.push_back(application);
+  }
+
+  return applications;
+}
+
 } // namespace content