Support setting mouse cursor icon in Android N.

content/shell/android/javatests/src/org/chromium/content_shell_apk/ContentShellTestCommon.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_shell_apk;
 
 import static org.chromium.base.test.util.ScalableTimeout.scaleTimeout;
 
 import android.annotation.TargetApi;
 import android.app.Activity;
@@ skipping 14 matching lines @@
 import org.chromium.base.test.util.UrlUtils;
 import org.chromium.content.browser.ContentView;
 import org.chromium.content.browser.ContentViewCore;
 import org.chromium.content.browser.test.util.Criteria;
 import org.chromium.content.browser.test.util.CriteriaHelper;
 import org.chromium.content.browser.test.util.TestCallbackHelperContainer;
 import org.chromium.content_public.browser.LoadUrlParams;
 import org.chromium.content_public.browser.NavigationController;
 import org.chromium.content_public.browser.WebContents;
 import org.chromium.content_shell.Shell;
+import org.chromium.content_shell.ShellViewAndroidDelegate.OnCursorUpdateHelper;
 
 import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 
 /**
  * Implementation of utility methods for ContentShellTestBase and ContentShellActivityTestRule to
  * wrap around during instrumentation test JUnit3 to JUnit4 migration
  *
  * Please do not use this class' methods in places other than {@link ContentShellTestBase}
@@ skipping 64 matching lines @@
                 }
                 if (TextUtils.isEmpty(shell.getContentViewCore().getWebContents().getUrl())) {
                     updateFailureReason("Shell's URL is empty or null.");
                     return false;
                 }
                 return true;
             }
         }, WAIT_FOR_ACTIVE_SHELL_LOADING_TIMEOUT, CriteriaHelper.DEFAULT_POLLING_INTERVAL);
     }
 
+    OnCursorUpdateHelper getOnCursorUpdateHelper() throws ExecutionException {
+        return ThreadUtils
+                .runOnUiThreadBlocking(new Callable<Shell>() {
+                    @Override
+                    public Shell call() {
+                        return mCallback.getActivityForTestCommon().getActiveShell();
+                    }
+                })
+                .getViewAndroidDelegate()

[boliu, 2017/06/02 15:54:41]

these two should be on UI thread as well

[jaebaek, 2017/06/03 14:24:10]

Done.

+                .getOnCursorUpdateHelper();
+    }
+
     ContentViewCore getContentViewCore() {
         return mCallback.getActivityForTestCommon().getActiveShell().getContentViewCore();
     }
 
     WebContents getWebContents() {
         return mCallback.getActivityForTestCommon().getActiveShell().getWebContents();
     }
 
     void loadUrl(final NavigationController navigationController,
             TestCallbackHelperContainer callbackHelperContainer, final LoadUrlParams params)
@@ skipping 62 matching lines @@
         Instrumentation getInstrumentationForTestCommon();
         T launchActivityWithIntentForTestCommon(Intent t);
         T getActivityForTestCommon();
         void runOnUiThreadForTestCommon(Runnable runnable) throws Throwable;
         ContentViewCore getContentViewCoreForTestCommon();
         ContentShellActivity launchContentShellWithUrlForTestCommon(String url);
         WebContents getWebContentsForTestCommon();
         void waitForActiveShellToBeDoneLoadingForTestCommon();
     }
 }