[Android CCT] Daggerize CustomTabTaskDescriptionHelper

This CL refactors CustomTabTaskDescriptionHelper in preparation for
making WebAPKs use CustomTabTaskDescriptionHelper

This CL:
- Makes CustomTabTaskDescriptionHelper a LifecycleObserver and moves
logic to determine whether to customize the task desckription to
CustomTabTaskDescriptionHelper
- Replaces the use of TabModelSelectorObserver and
TabModelSelectorTabModelObserver with
CustomTabActivityTabProvider.Observer
- Replaces CustomTabTaskDescriptionHelper#mCurrentTab with
CustomTabActivityTabProvider#getTab()

BUG=989912

Change-Id: Iebde1ece8b00bf5c532b2f38ed1cfec24a4f1982
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1907520
Commit-Queue: Peter Kotwicz <pkotwicz@chromium.org>
Reviewed-by: Peter Conn <peconn@chromium.org>
Cr-Commit-Position: refs/heads/master@{#716339}

chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java

@@ -16,7 +16,6 @@ import android.graphics.Color;
 import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
-import android.os.Build;
 import android.os.Bundle;
 import android.provider.Browser;
 import android.util.Pair;
@@ -98,8 +97,6 @@ public class CustomTabActivity extends ChromeActivity<CustomTabActivityComponent
     @Nullable
     private DynamicModuleCoordinator mDynamicModuleCoordinator;
 
-    private CustomTabTaskDescriptionHelper mTaskDescriptionHelper;
-
     private CustomTabNightModeStateController mNightModeStateController;
 
     /**
@@ -251,11 +248,6 @@ public class CustomTabActivity extends ChromeActivity<CustomTabActivityComponent
 
         mConnection.showSignInToastIfNecessary(mSession, getIntent());
 
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP && useSeparateTask()) {
-            mTaskDescriptionHelper = new CustomTabTaskDescriptionHelper(this,
-                    ApiCompatibilityUtils.getColor(getResources(), R.color.default_primary_color));
-        }
-
         if (isTaskRoot() && UsageStatsService.isEnabled()) {
             UsageStatsService.getInstance().createPageViewObserver(getTabModelSelector(), this);
         }
@@ -312,12 +304,6 @@ public class CustomTabActivity extends ChromeActivity<CustomTabActivityComponent
         if (earlyCreatedTabIsReady) postDeferredStartupIfNeeded();
     }
 
-    @Override
-    protected void onDestroyInternal() {
-        super.onDestroyInternal();
-        if (mTaskDescriptionHelper != null) mTaskDescriptionHelper.destroy();
-    }
-
     @Override
     public void createContextualSearchTab(String searchUrl) {
         if (getActivityTab() == null) return;
@@ -611,6 +597,7 @@ public class CustomTabActivity extends ChromeActivity<CustomTabActivityComponent
         component.resolveCompositorContentInitializer();
         component.resolveSessionHandler();
         component.resolveToolbarColorController();
+        component.resolveTaskDescriptionHelper();
 
         if (mIntentDataProvider.isTrustedWebActivity()) {
             component.resolveTrustedWebActivityCoordinator();

chrome/android/java/src/org/chromium/chrome/browser/customtabs/dependency_injection/CustomTabActivityComponent.java

@@ -13,6 +13,7 @@ import org.chromium.chrome.browser.customtabs.CustomTabCompositorContentInitiali
 import org.chromium.chrome.browser.customtabs.CustomTabSessionHandler;
 import org.chromium.chrome.browser.customtabs.CustomTabStatusBarColorProvider;
 import org.chromium.chrome.browser.customtabs.CustomTabTabPersistencePolicy;
+import org.chromium.chrome.browser.customtabs.CustomTabTaskDescriptionHelper;
 import org.chromium.chrome.browser.customtabs.CustomTabUmaRecorder;
 import org.chromium.chrome.browser.customtabs.ReparentingTaskProvider;
 import org.chromium.chrome.browser.customtabs.content.CustomTabActivityNavigationController;
@@ -43,6 +44,7 @@ public interface CustomTabActivityComponent extends ChromeActivityComponent {
     DynamicModuleToolbarController resolveDynamicModuleToolbarController();
     DynamicModuleCoordinator resolveDynamicModuleCoordinator();
 
+    CustomTabTaskDescriptionHelper resolveTaskDescriptionHelper();
     CustomTabBottomBarDelegate resolveBottomBarDelegate();
     CustomTabActivityTabController resolveTabController();
     CustomTabActivityTabFactory resolveTabFactory();