Use the correct TabDelegateFactory for ReparentingTask clients

ChromeTabCreator and CustomTabActivityTabController both have their own
instances of TabDelegateFactory that should be used with
ReparentingTask. These were changed incorrectly in crrev.com/c/1980962.

Bug: 1048602
Change-Id: I1cdac903b4794fe00f5e4ba0fb8a3d8e2bbcf4b0
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2076005Reviewed-by: Yusuf Ozuysal <yusufo@chromium.org>
Commit-Queue: Brandon Wylie <wylieb@chromium.org>
Cr-Commit-Position: refs/heads/master@{#745324}

chrome/android/java/src/org/chromium/chrome/browser/customtabs/content/CustomTabActivityTabController.java

@@ -319,7 +319,7 @@ public class CustomTabActivityTabController
             mReparentingTaskProvider.get(tab).finish(
                     ReparentingDelegateFactory.createReparentingTaskDelegate(
                             mActivity.getCompositorViewHolder(), mActivity.getWindowAndroid(),
-                            mActivity.getTabDelegateFactory()),
+                            mCustomTabDelegateFactory.get()),
                     (params == null ? null : params.getFinalizeCallback()));
         }
 

chrome/android/java/src/org/chromium/chrome/browser/tabmodel/ChromeTabCreator.java

@@ -157,7 +157,7 @@ public class ChromeTabCreator extends TabCreatorManager.TabCreator {
                 ReparentingTask.from(tab).finish(
                         ReparentingDelegateFactory.createReparentingTaskDelegate(
                                 mActivity.getCompositorViewHolder(), mActivity.getWindowAndroid(),
-                                mActivity.getTabDelegateFactory()),
+                                createDefaultTabDelegateFactory()),
                         params.getFinalizeCallback());
             } else if (asyncParams != null && asyncParams.getWebContents() != null) {
                 openInForeground = true;