Properly throw java exceptions from shouldOverrideUrlLoading

base/android/java/src/org/chromium/base/SystemMessageHandler.java

 // Copyright 2012 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.base;
 
 import android.annotation.SuppressLint;
 import android.os.Build;
 import android.os.Handler;
 import android.os.Message;
 
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.base.annotations.MainDex;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 
 @MainDex
 class SystemMessageHandler extends Handler {
 
     private static final String TAG = "cr.SysMessageHandler";
 
     private static final int SCHEDULED_WORK = 1;
     private static final int DELAYED_SCHEDULED_WORK = 2;
 
     // Native class pointer set by the constructor of the SharedClient native class.
     private long mMessagePumpDelegateNative = 0;
+    private long mMessagePumpNative = 0;
     private long mDelayedScheduledTimeTicks = 0;
 
-    private SystemMessageHandler(long messagePumpDelegateNative) {
+    protected SystemMessageHandler(long messagePumpDelegateNative, long messagePumpNative) {
         mMessagePumpDelegateNative = messagePumpDelegateNative;
+        mMessagePumpNative = messagePumpNative;
     }
 
     @Override
     public void handleMessage(Message msg) {
         if (msg.what == DELAYED_SCHEDULED_WORK) {
             mDelayedScheduledTimeTicks = 0;
         }
-        nativeDoRunLoopOnce(mMessagePumpDelegateNative, mDelayedScheduledTimeTicks);
+        nativeDoRunLoopOnce(
+                mMessagePumpDelegateNative, mMessagePumpNative, mDelayedScheduledTimeTicks);
+    }
+
+    protected long getMessagePumpNative() {

[gsennton, 2016/08/16 15:27:36]

Ooops, will remove this.

[gsennton, 2016/08/17 17:05:47]

Done.

+        return mMessagePumpNative;
     }
 
     @SuppressWarnings("unused")
     @CalledByNative
     private void scheduleWork() {
         sendMessage(obtainAsyncMessage(SCHEDULED_WORK));
     }
 
     @SuppressWarnings("unused")
     @CalledByNative
@@ skipping 96 matching lines @@
                     mMessageMethodSetAsynchronous = null;
                 } catch (RuntimeException e) {
                     Log.e(TAG, "Runtime exception during async message creation, disabling.");
                     mMessageMethodSetAsynchronous = null;
                 }
             }
         }
     }
 
     @CalledByNative
-    private static SystemMessageHandler create(long messagePumpDelegateNative) {
-        return new SystemMessageHandler(messagePumpDelegateNative);
+    private static SystemMessageHandler create(
+            long messagePumpDelegateNative, long messagePumpNative) {
+        return new SystemMessageHandler(messagePumpDelegateNative, messagePumpNative);
     }
 
     private native void nativeDoRunLoopOnce(
-            long messagePumpDelegateNative, long delayedScheduledTimeTicks);
+            long messagePumpDelegateNative, long messagePumpNative, long delayedScheduledTimeTicks);
 }