Narrow dependencies to actual used data (2/n)

This replaces ChooserRequestParameters with a handful of values used
in each remaining reference outside of v2-forked code.

Bug: 300157408
Test: atest com.android.intentresolver
Change-Id: I4dd1f17ec171d92b6134a9b803344d3d2485a2b6

6 files changed, 27 insertions, 19 deletions

diff --git a/tests/activity/src/com/android/intentresolver/ChooserWrapperActivity.java b/tests/activity/src/com/android/intentresolver/ChooserWrapperActivity.java
index 72f1f452..27d50adf 100644
--- a/tests/activity/src/com/android/intentresolver/ChooserWrapperActivity.java
+++ b/tests/activity/src/com/android/intentresolver/ChooserWrapperActivity.java
@@ -71,7 +71,7 @@ public class ChooserWrapperActivity extends ChooserActivity implements IChooserW
             ResolverListController resolverListController,
             UserHandle userHandle,
             Intent targetIntent,
-            ChooserRequestParameters chooserRequest,
+            Intent referrrerFillInIntent,
             int maxTargetsPerRow,
             TargetDataLoader targetDataLoader) {
         PackageManager packageManager =
@@ -86,10 +86,10 @@ public class ChooserWrapperActivity extends ChooserActivity implements IChooserW
                 createListController(userHandle),
                 userHandle,
                 targetIntent,
+                referrrerFillInIntent,
                 this,
                 packageManager,
                 getEventLog(),
-                chooserRequest,
                 maxTargetsPerRow,
                 userHandle,
                 targetDataLoader);
diff --git a/tests/activity/src/com/android/intentresolver/v2/ChooserWrapperActivity.java b/tests/activity/src/com/android/intentresolver/v2/ChooserWrapperActivity.java
index 5572bb24..a314ee97 100644
--- a/tests/activity/src/com/android/intentresolver/v2/ChooserWrapperActivity.java
+++ b/tests/activity/src/com/android/intentresolver/v2/ChooserWrapperActivity.java
@@ -86,7 +86,7 @@ public class ChooserWrapperActivity extends ChooserActivity implements IChooserW
             ResolverListController resolverListController,
             UserHandle userHandle,
             Intent targetIntent,
-            ChooserRequestParameters chooserRequest,
+            Intent referrerFillInIntent,
             int maxTargetsPerRow,
             TargetDataLoader targetDataLoader) {
         PackageManager packageManager =
@@ -101,10 +101,10 @@ public class ChooserWrapperActivity extends ChooserActivity implements IChooserW
                 createListController(userHandle),
                 userHandle,
                 targetIntent,
+                referrerFillInIntent,
                 this,
                 packageManager,
                 getEventLog(),
-                chooserRequest,
                 maxTargetsPerRow,
                 userHandle,
                 targetDataLoader);
diff --git a/tests/shared/src/com/android/intentresolver/TestContentPreviewViewModel.kt b/tests/shared/src/com/android/intentresolver/TestContentPreviewViewModel.kt
index d239f612..888fc161 100644
--- a/tests/shared/src/com/android/intentresolver/TestContentPreviewViewModel.kt
+++ b/tests/shared/src/com/android/intentresolver/TestContentPreviewViewModel.kt
@@ -16,6 +16,7 @@
 
 package com.android.intentresolver
 
+import android.content.Intent
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.viewmodel.CreationExtras
@@ -29,8 +30,8 @@ class TestContentPreviewViewModel(
     private val imageLoader: ImageLoader? = null,
 ) : BasePreviewViewModel() {
     override fun createOrReuseProvider(
-        chooserRequest: ChooserRequestParameters
-    ): PreviewDataProvider = viewModel.createOrReuseProvider(chooserRequest)
+        targetIntent: Intent
+    ): PreviewDataProvider = viewModel.createOrReuseProvider(targetIntent)
 
     override fun createOrReuseImageLoader(): ImageLoader =
         imageLoader ?: viewModel.createOrReuseImageLoader()
diff --git a/tests/unit/src/com/android/intentresolver/ChooserListAdapterDataTest.kt b/tests/unit/src/com/android/intentresolver/ChooserListAdapterDataTest.kt
index e5927e36..9864d0bd 100644
--- a/tests/unit/src/com/android/intentresolver/ChooserListAdapterDataTest.kt
+++ b/tests/unit/src/com/android/intentresolver/ChooserListAdapterDataTest.kt
@@ -44,12 +44,7 @@ class ChooserListAdapterDataTest {
     private val targetDataLoader = mock<TargetDataLoader>()
     private val backgroundExecutor = TestExecutor()
     private val immediateExecutor = TestExecutor(immediate = true)
-    private val chooserRequestParams =
-        ChooserRequestParameters(
-            Intent.createChooser(targetIntent, ""),
-            "org.referrer.package",
-            null
-        )
+    private val referrerFillInIntent = Intent().putExtra(Intent.EXTRA_REFERRER, "org.referrer.package")
 
     @Test
     fun test_twoTargetsWithNonOverlappingInitialIntent_threeTargetsInResolverAdapter() {
@@ -91,10 +86,10 @@ class ChooserListAdapterDataTest {
                 resolverListController,
                 userHandle,
                 targetIntent,
+                referrerFillInIntent,
                 resolverListCommunicator,
                 packageManager,
                 FakeEventLog(InstanceId.fakeInstanceId(1)),
-                chooserRequestParams,
                 /*maxRankedTargets=*/ 2,
                 /*initialIntentsUserSpace=*/ userHandle,
                 targetDataLoader,
@@ -153,10 +148,10 @@ class ChooserListAdapterDataTest {
                 resolverListController,
                 userHandle,
                 targetIntent,
+                referrerFillInIntent,
                 resolverListCommunicator,
                 packageManager,
                 FakeEventLog(InstanceId.fakeInstanceId(1)),
-                chooserRequestParams,
                 /*maxRankedTargets=*/ 2,
                 /*initialIntentsUserSpace=*/ userHandle,
                 targetDataLoader,
diff --git a/tests/unit/src/com/android/intentresolver/ChooserListAdapterTest.kt b/tests/unit/src/com/android/intentresolver/ChooserListAdapterTest.kt
index a4078365..a12c9ec1 100644
--- a/tests/unit/src/com/android/intentresolver/ChooserListAdapterTest.kt
+++ b/tests/unit/src/com/android/intentresolver/ChooserListAdapterTest.kt
@@ -67,10 +67,10 @@ class ChooserListAdapterTest {
             resolverListController,
             userHandle,
             Intent(),
+            Intent(),
             mock(),
             packageManager,
             mEventLog,
-            mock(),
             0,
             null,
             mTargetDataLoader
diff --git a/tests/unit/src/com/android/intentresolver/v2/ChooserActionFactoryTest.kt b/tests/unit/src/com/android/intentresolver/v2/ChooserActionFactoryTest.kt
index a1a9bc92..b3486bb1 100644
--- a/tests/unit/src/com/android/intentresolver/v2/ChooserActionFactoryTest.kt
+++ b/tests/unit/src/com/android/intentresolver/v2/ChooserActionFactoryTest.kt
@@ -135,7 +135,10 @@ class ChooserActionFactoryTest {
         val testSubject =
             ChooserActionFactory(
                 context,
-                chooserRequest,
+                chooserRequest.targetIntent,
+                chooserRequest.referrerPackageName,
+                chooserRequest.chooserActions,
+                chooserRequest.modifyShareAction,
                 Optional.empty(),
                 logger,
                 {},
@@ -158,7 +161,10 @@ class ChooserActionFactoryTest {
         val testSubject =
             ChooserActionFactory(
                 context,
-                chooserRequest,
+                chooserRequest.targetIntent,
+                chooserRequest.referrerPackageName,
+                chooserRequest.chooserActions,
+                chooserRequest.modifyShareAction,
                 Optional.empty(),
                 logger,
                 {},
@@ -181,7 +187,10 @@ class ChooserActionFactoryTest {
         val testSubject =
             ChooserActionFactory(
                 context,
-                chooserRequest,
+                chooserRequest.targetIntent,
+                chooserRequest.referrerPackageName,
+                chooserRequest.chooserActions,
+                chooserRequest.modifyShareAction,
                 Optional.empty(),
                 logger,
                 {},
@@ -220,7 +229,10 @@ class ChooserActionFactoryTest {
 
         return ChooserActionFactory(
             context,
-            chooserRequest,
+            chooserRequest.targetIntent,
+            chooserRequest.referrerPackageName,
+            chooserRequest.chooserActions,
+            chooserRequest.modifyShareAction,
             Optional.empty(),
             logger,
             {},