[Feedback] Use callbacks for FeedbackCollector and use ScreenshotTask

chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java

Index: chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
index 19cf3fb6525152d9bfb983d5d1437cc2ed0a3b76..96b8700202a210b11bc1c4a9a393011c1e5cf633 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
@@ -72,7 +72,6 @@ import org.chromium.chrome.browser.dom_distiller.ReaderModeActivityDelegate;
 import org.chromium.chrome.browser.dom_distiller.ReaderModeManager;
 import org.chromium.chrome.browser.enhanced_bookmarks.EnhancedBookmarksModel;
 import org.chromium.chrome.browser.enhancedbookmarks.EnhancedBookmarkUtils;
-import org.chromium.chrome.browser.feedback.FeedbackCollector;
 import org.chromium.chrome.browser.fullscreen.ChromeFullscreenManager;
 import org.chromium.chrome.browser.gsa.ContextReporter;
 import org.chromium.chrome.browser.gsa.GSAServiceClient;
@@ -1257,20 +1256,11 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
         } else if (id == R.id.help_id) {
             // Since reading back the compositor is asynchronous, we need to do the readback
             // before starting the GoogleHelp.
-            final String helpContextId = HelpAndFeedback.getHelpContextIdFromUrl(
+            String helpContextId = HelpAndFeedback.getHelpContextIdFromUrl(
                     this, currentTab.getUrl(), getCurrentTabModel().isIncognito());
-            final Activity mainActivity = this;
-            final FeedbackCollector collector =
-                    FeedbackCollector.create(currentTab.getProfile(), currentTab.getUrl());
-            startTakingCompositorActivityScreenshot(new GetBitmapCallback() {
-                @Override
-                public void onFinishGetBitmap(Bitmap bitmap, int response) {
-                    collector.setScreenshot(bitmap);
-                    HelpAndFeedback.getInstance(mainActivity)
-                            .show(mainActivity, helpContextId, collector);
-                    RecordUserAction.record("MobileMenuFeedback");
-                }
-            });
+            HelpAndFeedback.getInstance(this)
+                    .show(this, helpContextId, currentTab.getProfile(), currentTab.getUrl());
+            RecordUserAction.record("MobileMenuFeedback");
         } else {
             return false;
         }