[WebAPKs] Plumb service worker scope to notifications

chrome/browser/notifications/notification_platform_bridge_android.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 "chrome/browser/notifications/notification_platform_bridge_android.h"
 
 #include <utility>
 #include <vector>
 
 #include "base/android/jni_array.h"
@@ skipping 164 matching lines @@
     const std::string& profile_id,
     bool incognito,
     const Notification& notification) {
   JNIEnv* env = AttachCurrentThread();
   // TODO(miguelg): Store the notification type in java instead of assuming it's
   // persistent once/if non persistent notifications are ever implemented on
   // 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)) {
+    GURL scope_url(notification.service_worker_scope());
+    if (!scope_url.is_valid())
+      scope_url = origin_url;
+    ScopedJavaLocalRef<jstring> j_scope_url =
+        ConvertUTF8ToJavaString(env, scope_url.spec());
     webapk_package = Java_NotificationPlatformBridge_queryWebApkPackage(
-        env, java_object_.obj(), origin.obj());
+        env, java_object_.obj(), j_scope_url.obj());
   } else {
     webapk_package = ConvertUTF8ToJavaString(env, "");
   }
 
   ScopedJavaLocalRef<jstring> j_notification_id =
       ConvertUTF8ToJavaString(env, notification_id);
+  ScopedJavaLocalRef<jstring> j_origin =
+      ConvertUTF8ToJavaString(env, origin_url.spec());
   ScopedJavaLocalRef<jstring> tag =
       ConvertUTF8ToJavaString(env, notification.tag());
   ScopedJavaLocalRef<jstring> title =
       ConvertUTF16ToJavaString(env, notification.title());
   ScopedJavaLocalRef<jstring> body =
       ConvertUTF16ToJavaString(env, notification.message());
 
   ScopedJavaLocalRef<jobject> notification_icon;
   SkBitmap notification_icon_bitmap = notification.icon().AsBitmap();
   if (!notification_icon_bitmap.drawsNothing())
@@ skipping 13 matching lines @@
   ScopedJavaLocalRef<jobjectArray> action_icons =
       ConvertToJavaBitmaps(notification.buttons());
 
   ScopedJavaLocalRef<jintArray> vibration_pattern =
       base::android::ToJavaIntArray(env, notification.vibration_pattern());
 
   ScopedJavaLocalRef<jstring> j_profile_id =
       ConvertUTF8ToJavaString(env, profile_id);
 
   Java_NotificationPlatformBridge_displayNotification(
-      env, java_object_.obj(), j_notification_id.obj(), origin.obj(),
+      env, java_object_.obj(), j_notification_id.obj(), j_origin.obj(),
       j_profile_id.obj(), incognito, tag.obj(), webapk_package.obj(),
       title.obj(), body.obj(), notification_icon.obj(), badge.obj(),
       vibration_pattern.obj(), notification.timestamp().ToJavaTime(),
       notification.renotify(), notification.silent(), action_titles.obj(),
       action_icons.obj());
 
   regenerated_notification_infos_[notification_id] =
       RegeneratedNotificationInfo(origin_url.spec(), notification.tag(),
                                   ConvertJavaStringToUTF8(env, webapk_package));
 }
@@ skipping 56 matching lines @@
     RegeneratedNotificationInfo() {}
 
 NotificationPlatformBridgeAndroid::RegeneratedNotificationInfo::
     RegeneratedNotificationInfo(const std::string& origin,
                                 const std::string& tag,
                                 const std::string& webapk_package)
     : origin(origin), tag(tag), webapk_package(webapk_package) {}
 
 NotificationPlatformBridgeAndroid::RegeneratedNotificationInfo::
     ~RegeneratedNotificationInfo() {}