Update checks for Android O to use generalized check

A couple of places in our code-based were hand-written to check for
whether the code was running on Android O, before we added support
for this through BuildInfo#isAtLeastO().

This CL makes them both call the generic method, so if that
generic method is changed, they will both benefit from that.

BUG=704209

Change-Id: I44b583af0744a67c889ef786eef7e6a96ddf8eed
Reviewed-on: https://chromium-review.googlesource.com/488129Reviewed-by: Dan Alcantara <dfalcantara@chromium.org>
Reviewed-by: Ted Choc <tedchoc@chromium.org>
Commit-Queue: Tommy Nyquist <nyquist@chromium.org>
Cr-Commit-Position: refs/heads/master@{#467585}

chrome/android/java/src/org/chromium/chrome/browser/upgrade/PackageReplacedBroadcastReceiver.java

@@ -8,8 +8,8 @@ import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.os.AsyncTask;
-import android.os.Build;
 
+import org.chromium.base.BuildInfo;
 import org.chromium.chrome.browser.notifications.ChannelsUpdater;
 
 /**
@@ -31,7 +31,7 @@ public final class PackageReplacedBroadcastReceiver extends BroadcastReceiver {
     public void onReceive(final Context context, Intent intent) {
         if (!Intent.ACTION_MY_PACKAGE_REPLACED.equals(intent.getAction())) return;
         updateChannelsIfNecessary();
-        if (Build.VERSION.SDK_INT > Build.VERSION_CODES.N) return;
+        if (BuildInfo.isAtLeastO()) return;
         UpgradeIntentService.startMigrationIfNecessary(context);
     }
 

chrome/android/java/src/org/chromium/chrome/browser/widget/ViewResourceFrameLayout.java

@@ -7,12 +7,12 @@ package org.chromium.chrome.browser.widget;
 import android.content.Context;
 import android.graphics.Canvas;
 import android.graphics.Rect;
-import android.os.Build;
 import android.util.AttributeSet;
 import android.view.View;
 import android.view.ViewParent;
 import android.widget.FrameLayout;
 
+import org.chromium.base.BuildInfo;
 import org.chromium.ui.resources.dynamics.ViewResourceAdapter;
 
 /**
@@ -66,7 +66,7 @@ public class ViewResourceFrameLayout extends FrameLayout {
     protected void dispatchDraw(Canvas canvas) {
         super.dispatchDraw(canvas);
         // TODO(tedchoc): Switch to a better API when available. crbug.com/681877
-        if (Build.VERSION.CODENAME.equals("O") && isReadyForCapture()) {
+        if (BuildInfo.isAtLeastO() && isReadyForCapture()) {
             mResourceAdapter.invalidate(null);
         }
     }