Expose WindowAndroid from WebContents.

chrome/android/java/src/org/chromium/chrome/browser/payments/AndroidPaymentApp.java

Index: chrome/android/java/src/org/chromium/chrome/browser/payments/AndroidPaymentApp.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/payments/AndroidPaymentApp.java b/chrome/android/java/src/org/chromium/chrome/browser/payments/AndroidPaymentApp.java
index 1e977e733f619db5bab2d09456a7b10d8804ceb1..f7658449477bea2799a134638a6ab16c33d4bb94 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/payments/AndroidPaymentApp.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/payments/AndroidPaymentApp.java
@@ -21,7 +21,6 @@ import org.chromium.IsReadyToPayService;
 import org.chromium.IsReadyToPayServiceCallback;
 import org.chromium.base.ThreadUtils;
 import org.chromium.chrome.R;
-import org.chromium.content.browser.ContentViewCore;
 import org.chromium.content_public.browser.WebContents;
 import org.chromium.payments.mojom.PaymentDetailsModifier;
 import org.chromium.payments.mojom.PaymentItem;
@@ -143,13 +142,7 @@ public class AndroidPaymentApp extends PaymentInstrument implements PaymentApp,
         if (mIsReadyToPayService != null) {
             sendIsReadyToPayIntentToPaymentApp();
         } else {
-            ContentViewCore contentView = ContentViewCore.fromWebContents(mWebContents);
-            if (contentView == null) {
-                respondToGetInstrumentsQuery(null);
-                return;
-            }
-
-            WindowAndroid window = contentView.getWindowAndroid();
+            WindowAndroid window = mWebContents.getTopLevelNativeWindow();
             if (window == null) {
                 respondToGetInstrumentsQuery(null);
                 return;
@@ -248,13 +241,7 @@ public class AndroidPaymentApp extends PaymentInstrument implements PaymentApp,
 
         mInstrumentDetailsCallback = callback;
 
-        ContentViewCore contentView = ContentViewCore.fromWebContents(mWebContents);
-        if (contentView == null) {
-            notifyError();
-            return;
-        }
-
-        WindowAndroid window = contentView.getWindowAndroid();
+        WindowAndroid window = mWebContents.getTopLevelNativeWindow();
         if (window == null) {
             notifyError();
             return;