Remove InstalledWebappBridge::ShouldDelegateLocationPermission

This CL makes the DecidePermission check if it is possible to get a
InstalledWebappGeolocationContext instead of checking the
InstalledWebappBridge::ShouldDelegateLocationPermission

GetInstalledWebappGeolocationContext() returns nullptr when either not
running in TWA mode or should not delegate geolocation to it.
It's mostly the same logic as the one in InstalledWebappBridge,
except checking the current customtabsactivity instead of the
LastTrackedFocusedTwaCustomTabActivity. so it's better using this one.

Bug: 1106391
Change-Id: If66b10b44d71d30358088c00245c315be5c15829
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2303049Reviewed-by: Dominick Ng <dominickn@chromium.org>
Reviewed-by: Peter Conn <peconn@chromium.org>
Commit-Queue: Ella Ge <eirage@chromium.org>
Cr-Commit-Position: refs/heads/master@{#789393}

chrome/android/java/src/org/chromium/chrome/browser/browserservices/permissiondelegation/InstalledWebappBridge.java

@@ -77,17 +77,6 @@ public class InstalledWebappBridge {
         return permission.setting;
     }
 
-    @CalledByNative
-    private static boolean shouldDelegateLocationPermission(String url) {
-        TrustedWebActivityPermissionManager manager = TrustedWebActivityPermissionManager.get();
-        Origin origin = Origin.create(Uri.parse(url));
-        if (origin == null) return false;
-        String packageName = manager.getDelegatePackageName(origin);
-        return manager.isRunningTwa()
-                && TrustedWebActivityPermissionManager.hasAndroidLocationPermission(packageName)
-                != null;
-    }
-
     @CalledByNative
     private static void decidePermission(String url, long callback) {
         Origin origin = Origin.create(Uri.parse(url));

chrome/browser/geolocation/geolocation_permission_context_delegate_android.cc

@@ -18,6 +18,7 @@
 #include "components/search_engines/template_url_service.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/web_contents.h"
+#include "content/public/browser/web_contents_delegate.h"
 #include "url/gurl.h"
 
 GeolocationPermissionContextDelegateAndroid::
@@ -34,8 +35,8 @@ bool GeolocationPermissionContextDelegateAndroid::DecidePermission(
     bool user_gesture,
     permissions::BrowserPermissionCallback* callback,
     permissions::GeolocationPermissionContext* context) {
-  if (InstalledWebappBridge::ShouldDelegateLocationPermission(
-          requesting_origin)) {
+  if (web_contents->GetDelegate() &&
+      web_contents->GetDelegate()->GetInstalledWebappGeolocationContext()) {
     InstalledWebappBridge::PermissionResponseCallback permission_callback =
         base::BindOnce(
             &permissions::GeolocationPermissionContext::NotifyPermissionSet,

chrome/browser/installable/installed_webapp_bridge.cc

@@ -63,21 +63,6 @@ void InstalledWebappBridge::SetProviderInstance(
       base::android::AttachCurrentThread(), (jlong) provider);
 }
 
-bool InstalledWebappBridge::ShouldDelegateLocationPermission(
-    const GURL& origin_url) {
-  if (!base::FeatureList::IsEnabled(
-          chrome::android::kTrustedWebActivityLocationDelegation)) {
-    return false;
-  }
-
-  JNIEnv* env = base::android::AttachCurrentThread();
-  ScopedJavaLocalRef<jstring> j_origin =
-      base::android::ConvertUTF8ToJavaString(env, origin_url.spec());
-  jboolean result = Java_InstalledWebappBridge_shouldDelegateLocationPermission(
-      env, j_origin);
-  return result;
-}
-
 void InstalledWebappBridge::DecidePermission(
     const GURL& origin_url,
     PermissionResponseCallback callback) {

chrome/browser/installable/installed_webapp_bridge.h

@@ -22,9 +22,6 @@ class InstalledWebappBridge {
 
   static void SetProviderInstance(InstalledWebappProvider* provider);
 
-  // Returns whether permission should be delegate to TWA.
-  static bool ShouldDelegateLocationPermission(const GURL& origin_url);
-
   static void DecidePermission(const GURL& origin_url,
                                PermissionResponseCallback callback);