[Print] Cleanup null check and Android version checks

With https://crrev/c/1925239, PrintingControllerImpl.getInstance() will
always give an non-null instance, we don't need to check if it is null
or not anymore.

Chrome for Android doesn't support less than KitKat, so we could remove
few checks and annotations now.

Bug: None
Test: Current tests should pass, manually tested window.print() and share
Test: menu code paths.
Change-Id: Ia0a9e41c0eef6d693b39547646e462bb4af4292c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1928629Reviewed-by: Ted Choc <tedchoc@chromium.org>
Commit-Queue: Shimi Zhang <ctzsm@chromium.org>
Cr-Commit-Position: refs/heads/master@{#720732}

chrome/android/javatests/src/org/chromium/chrome/browser/printing/PrintingControllerTest.java

@@ -4,9 +4,6 @@
 
 package org.chromium.chrome.browser.printing;
 
-import android.annotation.SuppressLint;
-import android.annotation.TargetApi;
-import android.os.Build;
 import android.os.CancellationSignal;
 import android.os.ParcelFileDescriptor;
 import android.print.PageRange;
@@ -26,7 +23,6 @@ import org.junit.runner.RunWith;
 import org.chromium.base.test.util.CallbackHelper;
 import org.chromium.base.test.util.CommandLineFlags;
 import org.chromium.base.test.util.Feature;
-import org.chromium.base.test.util.MinAndroidSdkLevel;
 import org.chromium.base.test.util.RetryOnFailure;
 import org.chromium.base.test.util.TestFileUtil;
 import org.chromium.base.test.util.UrlUtils;
@@ -58,8 +54,6 @@ import java.util.concurrent.TimeoutException;
  */
 @RunWith(ChromeJUnit4ClassRunner.class)
 @RetryOnFailure
-@SuppressLint("NewApi")
-@MinAndroidSdkLevel(Build.VERSION_CODES.KITKAT)
 @CommandLineFlags.Add({ChromeSwitches.DISABLE_FIRST_RUN_EXPERIENCE})
 public class PrintingControllerTest {
     @Rule
@@ -156,12 +150,9 @@ public class PrintingControllerTest {
      * order, in the UI thread.
      */
     @Test
-    @TargetApi(Build.VERSION_CODES.KITKAT)
     @LargeTest
     @Feature({"Printing"})
     public void testNormalPrintingFlow() throws Throwable {
-        if (!(Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT)) return;
-
         mActivityTestRule.startMainActivityWithURL(URL);
         final Tab currentTab = mActivityTestRule.getActivity().getActivityTab();
 
@@ -225,12 +216,9 @@ public class PrintingControllerTest {
      * don't crash and won't call into framework.
      */
     @Test
-    @TargetApi(Build.VERSION_CODES.KITKAT)
     @MediumTest
     @Feature({"Printing"})
     public void testPrintCloseWindowBeforeStart() {
-        if (!(Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT)) return;
-
         mActivityTestRule.startMainActivityWithURL(URL);
         final Tab currentTab = mActivityTestRule.getActivity().getActivityTab();
         final PrintingControllerImpl printingController = createControllerOnUiThread();
@@ -254,12 +242,9 @@ public class PrintingControllerTest {
      * let framework notify user that we can't perform printing job.
      */
     @Test
-    @TargetApi(Build.VERSION_CODES.KITKAT)
     @LargeTest
     @Feature({"Printing"})
     public void testPrintCloseWindowBeforeOnWrite() throws Throwable {
-        if (!(Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT)) return;
-
         mActivityTestRule.startMainActivityWithURL(URL);
         final Tab currentTab = mActivityTestRule.getActivity().getActivityTab();
         final PrintingControllerImpl printingController = createControllerOnUiThread();
@@ -321,12 +306,9 @@ public class PrintingControllerTest {
      * Crash test, pass if there is no crash.
      */
     @Test
-    @TargetApi(Build.VERSION_CODES.KITKAT)
     @MediumTest
     @Feature({"Printing"})
     public void testCancelPrintBeforeWriteResultCallbacks() throws Throwable {
-        if (!(Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT)) return;
-
         mActivityTestRule.startMainActivityWithURL(URL);
 
         final WaitForOnWriteHelper onWriteHelper = new WaitForOnWriteHelper();
@@ -382,8 +364,6 @@ public class PrintingControllerTest {
     @SmallTest
     @Feature({"Printing"})
     public void testPdfWritingDoneCalledWithoutInitailizePrintingTask() {
-        if (!(Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT)) return;
-
         mActivityTestRule.startMainActivityWithURL(URL);
         final PrintingControllerImpl controller = createControllerOnUiThread();
 
@@ -397,7 +377,6 @@ public class PrintingControllerTest {
                 () -> (PrintingControllerImpl) PrintingControllerImpl.getInstance());
     }
 
-    @TargetApi(Build.VERSION_CODES.KITKAT)
     private PrintAttributes createDummyPrintAttributes() {
         return new PrintAttributes.Builder()
                 .setMediaSize(PrintAttributes.MediaSize.ISO_A4)

printing/android/java/src/org/chromium/printing/PrintingContext.java

@@ -6,7 +6,6 @@ package org.chromium.printing;
 
 import android.app.Activity;
 
-import org.chromium.base.Log;
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.base.annotations.JNINamespace;
@@ -67,9 +66,7 @@ public class PrintingContext {
     @CalledByNative
     public void showPrintDialog() {
         ThreadUtils.assertOnUiThread();
-        if (mController != null) { // The native side doesn't check if printing is enabled
-            mController.startPendingPrint();
-        }
+        mController.startPendingPrint();
         // Reply to native side with |CANCEL| since there is no printing settings available yet at
         // this stage.
         showSystemDialogDone();
@@ -78,20 +75,17 @@ public class PrintingContext {
     @CalledByNative
     public static void pdfWritingDone(int pageCount) {
         ThreadUtils.assertOnUiThread();
-        if (PrintingControllerImpl.getInstance() != null) {
-            PrintingControllerImpl.getInstance().pdfWritingDone(pageCount);
-        } else {
-            Log.d(TAG, "No PrintingController, can't notify print completion.");
-        }
+
+        PrintingControllerImpl.getInstance().pdfWritingDone(pageCount);
     }
 
     @CalledByNative
     private static void setPendingPrint(
             WindowAndroid window, Printable printable, int renderProcessId, int renderFrameId) {
-        PrintingController printingController = PrintingControllerImpl.getInstance();
         Activity activity = window.getActivity().get();
-        if (printingController == null || activity == null) return;
+        if (activity == null) return;
 
+        PrintingController printingController = PrintingControllerImpl.getInstance();
         printingController.setPendingPrint(
                 printable, new PrintManagerDelegateImpl(activity), renderProcessId, renderFrameId);
     }