[SmartText selection] Implement TextClassifier getter and setter

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

 // Copyright 2017 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.content.browser;
 
 import android.support.annotation.IntDef;
 import android.text.TextUtils;
 
+import org.chromium.base.Log;
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.base.annotations.JNINamespace;
+import org.chromium.content_public.browser.TextClassifierProvider;
 import org.chromium.content_public.browser.WebContents;
-import org.chromium.ui.base.WindowAndroid;
 import org.chromium.ui.touch_selection.SelectionEventType;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 
 /**
  * A class that controls the classification of the textual selection.
  * It requests the selection together with its surrounding text from the focused frame and sends it
  * to ContextSelectionProvider which does the classification itself.
  */
 @JNINamespace("content")
 public class ContextSelectionClient implements SelectionClient {
     @IntDef({CLASSIFY, SUGGEST_AND_CLASSIFY})
     @Retention(RetentionPolicy.SOURCE)
     private @interface RequestType {}
 
     // Request to obtain the type (e.g. phone number, e-mail address) and the most
     // appropriate operation for the selected text.
     private static final int CLASSIFY = 0;
 
     // Request to obtain the type (e.g. phone number, e-mail address), the most
     // appropriate operation for the selected text and a better selection boundaries.
     private static final int SUGGEST_AND_CLASSIFY = 1;
 
     // The maximal number of characters on the left and on the right from the current selection.
     // Used for surrounding text request.
     private static final int NUM_EXTRA_CHARS = 100;
 
+    private static final String TAG = "ContextSelClient"; // 20 characters limit
+
     private long mNativeContextSelectionClient;
     private ContextSelectionProvider mProvider;
     private ContextSelectionProvider.ResultCallback mCallback;
 
     /**
      * Creates the ContextSelectionClient. Returns null in case ContextSelectionProvider
      * does not exist in the system.
      */
-    public static ContextSelectionClient create(ContextSelectionProvider.ResultCallback callback,
-            WindowAndroid windowAndroid, WebContents webContents) {
+    public static ContextSelectionClient create(
+            ContextSelectionProvider.ResultCallback callback, WebContents webContents) {
+        TextClassifierProvider tc_provider = webContents.getTextClassifierProvider();

[boliu, 2017/04/25 20:30:28]

camelCase

+        if (tc_provider == null) {
+            Log.e(TAG, "Cannot create object: no TextClassifierProvider");

[boliu, 2017/04/25 20:30:28]

assert, don't log

+            return null;
+        }
         ContextSelectionProvider provider =
-                ContentClassFactory.get().createContextSelectionProvider(callback, windowAndroid);
+                ContentClassFactory.get().createContextSelectionProvider(callback, tc_provider);
 
         // ContextSelectionProvider might not exist.
         if (provider == null) return null;
 
         return new ContextSelectionClient(provider, callback, webContents);
     }
 
     private ContextSelectionClient(ContextSelectionProvider provider,
             ContextSelectionProvider.ResultCallback callback, WebContents webContents) {
         mProvider = provider;
@@ skipping 84 matching lines @@
                 assert false : "Unexpected callback data";
                 break;
         }
     }
 
     private native long nativeInit(WebContents webContents);
     private native void nativeRequestSurroundingText(
             long nativeContextSelectionClient, int numExtraCharacters, int callbackData);
     private native void nativeCancelAllRequests(long nativeContextSelectionClient);
 }