[WebAPKs] Plumb service worker scope to notifications

chrome/browser/notifications/notification_platform_bridge_android.cc

Index: chrome/browser/notifications/notification_platform_bridge_android.cc
diff --git a/chrome/browser/notifications/notification_platform_bridge_android.cc b/chrome/browser/notifications/notification_platform_bridge_android.cc
index 8fc3e89530fa36340f668df7df1343ca455f1c55..c19b24bbb062fc5c135253dd70e5661c732fc9f8 100644
--- a/chrome/browser/notifications/notification_platform_bridge_android.cc
+++ b/chrome/browser/notifications/notification_platform_bridge_android.cc
@@ -181,22 +181,22 @@ void NotificationPlatformBridgeAndroid::Display(
   // Android.
   DCHECK_EQ(notification_type, NotificationCommon::PERSISTENT);
 
-  GURL origin_url(notification.origin_url().GetOrigin());
-
-  ScopedJavaLocalRef<jstring> origin =
-      ConvertUTF8ToJavaString(env, origin_url.spec());
-
   ScopedJavaLocalRef<jstring> webapk_package;
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kEnableWebApk)) {
+    ScopedJavaLocalRef<jstring> scope =
+        ConvertUTF8ToJavaString(env, notification.scope_url().spec());
     webapk_package = Java_NotificationPlatformBridge_queryWebApkPackage(
-        env, java_object_.obj(), origin.obj());
+        env, java_object_.obj(), scope.obj());
   } else {
     webapk_package = ConvertUTF8ToJavaString(env, "");
   }
 
   ScopedJavaLocalRef<jstring> j_notification_id =
       ConvertUTF8ToJavaString(env, notification_id);
+  GURL origin_url = notification.origin_url().GetOrigin();
+  ScopedJavaLocalRef<jstring> origin =
+      ConvertUTF8ToJavaString(env, origin_url.spec());
   ScopedJavaLocalRef<jstring> tag =
       ConvertUTF8ToJavaString(env, notification.tag());
   ScopedJavaLocalRef<jstring> title =