[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 163 matching lines @@
     const std::string& notification_id,
     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)) {
+    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 =
       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 90 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() {}