Remove ChromeActivity reference in ToolbarButtonInProductHelpController

Bug: 1123209
Change-Id: I5a379fb181f277cd3cd67c193912e29a0b949836
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2566738
Commit-Queue: Yaron Friedman <yfriedman@chromium.org>
Reviewed-by: Yaron Friedman <yfriedman@chromium.org>
Reviewed-by: Theresa  <twellington@chromium.org>
Reviewed-by: Patrick Noland <pnoland@chromium.org>
Cr-Commit-Position: refs/heads/master@{#837105}

chrome/android/java/src/org/chromium/chrome/browser/DEPS

@@ -339,9 +339,6 @@ specific_include_rules = {
   "ReturnToChromeExperimentsUtil\.java": [
     "+chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java",
   ],
-  "ToolbarButtonInProductHelpController\.java": [
-    "+chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java",
-  ],
   "CustomTabToolbar\.java": [
     "+chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java",
   ],

chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java

@@ -330,8 +330,10 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
         if (mActivity == null) return;
         mToolbarButtonIphTabSupplier = new ObservableSupplierImpl<>();
         mToolbarButtonInProductHelpController =
-                new ToolbarButtonInProductHelpController(mActivity, mAppMenuCoordinator,
-                        mActivity.getLifecycleDispatcher(), mToolbarButtonIphTabSupplier);
+                new ToolbarButtonInProductHelpController(mActivity, mActivity.getWindowAndroid(),
+                        mAppMenuCoordinator, mActivity.getLifecycleDispatcher(),
+                        mToolbarButtonIphTabSupplier, mActivity::isInOverviewMode,
+                        mToolbarManager.getMenuButtonView(), mToolbarManager.getSecurityIconView());
         ActivityTabProvider activityTabProvider = mActivity.getActivityTabProvider();
         mToolbarButtonIphTabObserver = new ActivityTabTabObserver(activityTabProvider) {
             @Override

chrome/android/java/src/org/chromium/chrome/browser/toolbar/DEPS

@@ -2,8 +2,10 @@ noparent = True
 
 include_rules = [
   "-chrome/android/java/src/org/chromium/chrome/browser",
+  "+base/android/java/src/org/chromium/base/supplier",
   "+chrome/android/java/src/org/chromium/chrome/browser/toolbar",
   "+chrome/android/java/src/org/chromium/chrome/browser/omnibox",
+  "+ui/android/java/src/org/chromium/ui/base",
 ]
 
 specific_include_rules = {