Change RelatedApplication from an interface to a dictionary.

TBR=mkwst@chromium.org

Bug: 687444
Change-Id: Iaae3fe5443c12982fa10d22c85a0894630a8354d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1831774
Commit-Queue: Rayan Kanso <rayankans@chromium.org>
Reviewed-by: Matt Giuca <mgiuca@chromium.org>
Cr-Commit-Position: refs/heads/master@{#704592}

third_party/blink/renderer/modules/installedapp/BUILD.gn

@@ -10,6 +10,5 @@ blink_modules_sources("installedapp") {
     "installed_app_controller.h",
     "navigator_installed_app.cc",
     "navigator_installed_app.h",
-    "related_application.h",
   ]
 }

third_party/blink/renderer/modules/installedapp/installed_app_controller.cc

@@ -96,8 +96,10 @@ void InstalledAppController::OnFilterInstalledApps(
     Vector<mojom::blink::RelatedApplicationPtr> result) {
   HeapVector<Member<RelatedApplication>> applications;
   for (const auto& res : result) {
-    auto* app = MakeGarbageCollected<RelatedApplication>(res->platform,
-                                                         res->url, res->id);
+    auto* app = MakeGarbageCollected<RelatedApplication>();
+    app->setPlatform(res->platform);
+    app->setURL(res->url);
+    app->setId(res->id);
     applications.push_back(app);
   }
   callbacks->OnSuccess(applications);

third_party/blink/renderer/modules/installedapp/related_application.h

-// Copyright 2016 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.
-
-#ifndef THIRD_PARTY_BLINK_RENDERER_MODULES_INSTALLEDAPP_RELATED_APPLICATION_H_
-#define THIRD_PARTY_BLINK_RENDERER_MODULES_INSTALLEDAPP_RELATED_APPLICATION_H_
-
-#include "third_party/blink/renderer/platform/bindings/script_wrappable.h"
-#include "third_party/blink/renderer/platform/heap/garbage_collected.h"
-#include "third_party/blink/renderer/platform/wtf/text/wtf_string.h"
-
-namespace blink {
-
-class RelatedApplication final : public ScriptWrappable {
-  DEFINE_WRAPPERTYPEINFO();
-
- public:
-  RelatedApplication(const String& platform,
-                     const String& url,
-                     const String& id)
-      : platform_(platform), url_(url), id_(id) {}
-  ~RelatedApplication() override = default;
-
-  String platform() const { return platform_; }
-  String url() const { return url_; }
-  String id() const { return id_; }
-
- private:
-  const String platform_;
-  const String url_;
-  const String id_;
-};
-
-}  // namespace blink
-
-#endif  // THIRD_PARTY_BLINK_RENDERER_MODULES_INSTALLEDAPP_RELATED_APPLICATION_H_

third_party/blink/renderer/modules/installedapp/related_application.idl

@@ -5,14 +5,8 @@
 // TODO(mgiuca): Link to full spec, rather than explainer, upon completion.
 // https://github.com/WICG/get-installed-related-apps/blob/master/EXPLAINER.md
 
-// TODO(mgiuca): This should be a dictionary, not an interface.
-// (NoInterfaceObject is basically a makeshift dictionary.)
-// https://crbug.com/687444.
-[
-    NoInterfaceObject,
-    RuntimeEnabled=InstalledApp
-] interface RelatedApplication {
-    readonly attribute DOMString platform;
-    readonly attribute DOMString url;
-    readonly attribute DOMString id;
+dictionary RelatedApplication {
+    required USVString platform;
+    USVString url;
+    DOMString id;
 };

third_party/blink/renderer/modules/modules_idl_files.gni

@@ -195,7 +195,6 @@ modules_idl_files =
           "indexeddb/idb_request.idl",
           "indexeddb/idb_transaction.idl",
           "indexeddb/idb_version_change_event.idl",
-          "installedapp/related_application.idl",
           "keyboard/keyboard.idl",
           "keyboard/keyboard_layout_map.idl",
           "locks/lock.idl",
@@ -650,6 +649,7 @@ modules_dictionary_idl_files =
           "indexeddb/idb_observer_init.idl",
           "indexeddb/idb_transaction_options.idl",
           "indexeddb/idb_version_change_event_init.idl",
+          "installedapp/related_application.idl",
           "locks/lock_info.idl",
           "locks/lock_manager_snapshot.idl",
           "locks/lock_options.idl",

third_party/blink/web_tests/installedapp/getinstalledrelatedapps.html

@@ -29,10 +29,10 @@ installedapp_test((t, mock) => {
       [{platform: 'play', url: null, id: 'com.test'},
        {platform: 'itunes', url: 'https://itunes.apple.com/', id: null}],
       [{platform: 'play', url: null, id: 'com.test'}]);
-  // TODO(mgiuca): The |url| field should be omitted from the result, not ''.
+
   return navigator.getInstalledRelatedApps().then(result => {
     assert_array_relatedapplication_equals(
-        result, [{platform: 'play', url: '', id: 'com.test'}]);
+        result, [{platform: 'play', id: 'com.test'}]);
   });
 }, 'getInstalledRelatedApps with related and installed apps (no url)');
 
@@ -46,12 +46,12 @@ installedapp_test((t, mock) => {
        {platform: 'itunes', url: 'https://itunes.apple.com/', id: null}],
       [{platform: 'play', url: null, id: 'com.test'},
        {platform: 'itunes', url: 'https://itunes.apple.com/', id: null}]);
-  // TODO(mgiuca): The null fields should be omitted from the result, not ''.
+
   return navigator.getInstalledRelatedApps().then(result => {
     assert_array_relatedapplication_equals(
         result,
-        [{platform: 'play', url: '', id: 'com.test'},
-         {platform: 'itunes', url: 'https://itunes.apple.com/', id: ''}]);
+        [{platform: 'play', id: 'com.test'},
+         {platform: 'itunes', url: 'https://itunes.apple.com/'}]);
   });
 }, 'getInstalledRelatedApps with multiple related and installed apps');