Index: third_party/WebKit/Source/modules/installedapp/InstalledAppController.cpp |
diff --git a/third_party/WebKit/Source/modules/installedapp/InstalledAppController.cpp b/third_party/WebKit/Source/modules/installedapp/InstalledAppController.cpp |
index 74a5597f86d239d807410837453a248d2567c1e5..d5c1f62c06f92e665c4e4951106bb8be073dbfc1 100644 |
--- a/third_party/WebKit/Source/modules/installedapp/InstalledAppController.cpp |
+++ b/third_party/WebKit/Source/modules/installedapp/InstalledAppController.cpp |
@@ -7,6 +7,7 @@ |
#include "core/dom/Document.h" |
#include "core/frame/LocalFrame.h" |
#include "platform/RuntimeEnabledFeatures.h" |
+#include "platform/weborigin/KURL.h" |
#include "public/platform/InterfaceProvider.h" |
#include "wtf/Functional.h" |
@@ -103,7 +104,8 @@ void InstalledAppController::filterByInstalledApps( |
DCHECK(!relatedApplication.platform.isEmpty()); |
convertedApplication->platform = relatedApplication.platform; |
convertedApplication->id = relatedApplication.id; |
- convertedApplication->url = relatedApplication.url; |
+ if (!relatedApplication.url.isNull()) |
+ convertedApplication->url = KURL(relatedApplication.url); |
mojoRelatedApps.push_back(std::move(convertedApplication)); |
} |
@@ -130,7 +132,8 @@ void InstalledAppController::OnFilterInstalledApps( |
for (const auto& res : result) { |
blink::WebRelatedApplication app; |
app.platform = res->platform; |
- app.url = res->url; |
+ if (res->url) |
+ app.url = *res->url; |
app.id = res->id; |
applications.push_back(app); |
} |