Remove cached Activity from TabWebContentsDelegate and ContextMenuPopulator

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

Index: chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabDelegateFactory.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabDelegateFactory.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabDelegateFactory.java
index 6ca6eeedf38d547a3fcdf629c36e6356cc2e9cf6..459c7575a042d420d9375cd0165a70d493667e8d 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabDelegateFactory.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabDelegateFactory.java
@@ -117,8 +117,8 @@ public class CustomTabDelegateFactory extends TabDelegateFactory {
         /**
          * See {@link TabWebContentsDelegateAndroid}.
          */
-        public CustomTabWebContentsDelegate(Tab tab, CustomTabActivity activity) {
-            super(tab, activity);
+        public CustomTabWebContentsDelegate(Tab tab) {
+            super(tab);
         }
 
         @Override
@@ -136,10 +136,8 @@ public class CustomTabDelegateFactory extends TabDelegateFactory {
     private ExternalNavigationHandler mNavigationHandler;
 
     @Override
-    public TabWebContentsDelegateAndroid createWebContentsDelegate(Tab tab,
-            ChromeActivity activity) {
-        assert activity instanceof CustomTabActivity;
-        return new CustomTabWebContentsDelegate(tab, (CustomTabActivity) activity);
+    public TabWebContentsDelegateAndroid createWebContentsDelegate(Tab tab) {
+        return new CustomTabWebContentsDelegate(tab);
     }
 
     @Override
@@ -151,9 +149,8 @@ public class CustomTabDelegateFactory extends TabDelegateFactory {
     }
 
     @Override
-    public ContextMenuPopulator createContextMenuPopulator(Tab tab, ChromeActivity activity) {
-        return new ChromeContextMenuPopulator(
-                new TabContextMenuItemDelegate(tab, activity),
+    public ContextMenuPopulator createContextMenuPopulator(Tab tab) {
+        return new ChromeContextMenuPopulator(new TabContextMenuItemDelegate(tab),
                 ChromeContextMenuPopulator.CUSTOM_TAB_MODE);
     }