Content class factory and generalized text selector

content/public/android/java/src/org/chromium/content/browser/SelectionPopupController.java

Index: content/public/android/java/src/org/chromium/content/browser/SelectionPopupController.java
diff --git a/content/public/android/java/src/org/chromium/content/browser/SelectionPopupController.java b/content/public/android/java/src/org/chromium/content/browser/SelectionPopupController.java
index 9b5936055b1ef659241700a224e1e81bd5d7349f..df9b17874908aae414f7ef7a56bced65d043c1f4 100644
--- a/content/public/android/java/src/org/chromium/content/browser/SelectionPopupController.java
+++ b/content/public/android/java/src/org/chromium/content/browser/SelectionPopupController.java
@@ -29,6 +29,7 @@ import org.chromium.base.Log;
 import org.chromium.base.VisibleForTesting;
 import org.chromium.base.metrics.RecordUserAction;
 import org.chromium.content.R;
+import org.chromium.content.browser.factory.ContentClassFactory;
 import org.chromium.content.browser.input.FloatingPastePopupMenu;
 import org.chromium.content.browser.input.ImeAdapter;
 import org.chromium.content.browser.input.LGEmailActionModeWorkaround;
@@ -115,6 +116,8 @@ public class SelectionPopupController extends ActionModeCallbackHelper {
     // The client that implements Contextual Search functionality, or null if none exists.
     private ContextualSearchClient mContextualSearchClient;
 
+    private ContextSelectionProvider mContextSelector;

[Tima Vaisburd, 2017/03/03 03:10:58]

Now I think that having both mContextualSearchClient and mContextSelector is
wrong, which means a new interface is only needed for the callback part.

This |mContextSelector| is to show the use of the factory only, to be removed.

+
     /**
      * Create {@link SelectionPopupController} instance.
      * @param context Context for action mode.
@@ -145,6 +148,11 @@ public class SelectionPopupController extends ActionModeCallbackHelper {
                 hideActionModeTemporarily(hideDuration);
             }
         };
+
+        if (ContentClassFactory.get() != null) {
+            mContextSelector = ContentClassFactory.get().createContextSelectionProvider(
+                    null, webContents, window);
+        }
     }
 
     /**