Refactor chrome's action mode logics and namings

android_webview/javatests/src/org/chromium/android_webview/test/TestAwContentsClient.java

Index: android_webview/javatests/src/org/chromium/android_webview/test/TestAwContentsClient.java
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/TestAwContentsClient.java b/android_webview/javatests/src/org/chromium/android_webview/test/TestAwContentsClient.java
index 6a6182f66664c4cff0db61bdf14fe42239f422cd..37915afb2b54c610493430dea92d15cea298e153 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/TestAwContentsClient.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/TestAwContentsClient.java
@@ -14,9 +14,9 @@ import android.webkit.ValueCallback;
 import org.chromium.android_webview.AwContentsClient.AwWebResourceRequest;
 import org.chromium.android_webview.AwWebResourceResponse;
 import org.chromium.base.ThreadUtils;
-import org.chromium.content.browser.SelectActionMode;
-import org.chromium.content.browser.SelectActionModeCallback;
-import org.chromium.content.browser.SelectActionModeCallback.ActionHandler;
+import org.chromium.content.browser.WebActionMode;
+import org.chromium.content.browser.WebActionModeCallback;
+import org.chromium.content.browser.WebActionModeCallback.ActionHandler;
 import org.chromium.content.browser.test.util.CallbackHelper;
 import org.chromium.content.browser.test.util.TestCallbackHelperContainer.OnEvaluateJavaScriptResultHelper;
 import org.chromium.content.browser.test.util.TestCallbackHelperContainer.OnPageCommitVisibleHelper;
@@ -222,13 +222,13 @@ public class TestAwContentsClient extends NullContentsClient {
     }
 
     @Override
-    public SelectActionMode startActionMode(
+    public WebActionMode startActionMode(
             View view, ActionHandler actionHandler, boolean floating) {
         if (floating) return null;
         ActionMode.Callback callback =
-                new SelectActionModeCallback(view.getContext(), actionHandler);
+                new WebActionModeCallback(view.getContext(), actionHandler);
         ActionMode actionMode = view.startActionMode(callback);
-        return actionMode != null ? new SelectActionMode(actionMode) : null;
+        return actionMode != null ? new WebActionMode(actionMode) : null;
     }
 
     public void setAllowSslError(boolean allow) {