Properly throw java exceptions from shouldOverrideUrlLoading

base/message_loop/message_pump_android.h

 // Copyright (c) 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.
 
 #ifndef BASE_MESSAGE_LOOP_MESSAGE_PUMP_ANDROID_H_
 #define BASE_MESSAGE_LOOP_MESSAGE_PUMP_ANDROID_H_
 
 #include <jni.h>
 
 #include "base/android/scoped_java_ref.h"
 #include "base/base_export.h"
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "base/message_loop/message_pump.h"
 
 namespace base {
 
+namespace android {
+class JavaMessageHandlerFactory;
+}
+
 class RunLoop;
 class TimeTicks;
+class WaitableEvent;
 
 // This class implements a MessagePump needed for TYPE_UI MessageLoops on
 // OS_ANDROID platform.
 class BASE_EXPORT MessagePumpForUI : public MessagePump {
  public:
   MessagePumpForUI();
   ~MessagePumpForUI() override;
 
   void Run(Delegate* delegate) override;
   void Quit() override;
   void ScheduleWork() override;
   void ScheduleDelayedWork(const TimeTicks& delayed_work_time) override;
 
   virtual void Start(Delegate* delegate);
+  void StartForUnitTest(Delegate* delegate,
+                        base::android::JavaMessageHandlerFactory* factory,
+                        WaitableEvent* test_done_event);
+
+  // We call Abort when there is a pending JNI exception, meaning that the
+  // current thread will crash when we return to Java.
+  // We can't call any jni-methods before returning to Java as we would then

[nyquist, 2016/08/18 15:50:02]

Nit: JNI and missing period at end of sentence.

[gsennton, 2016/08/18 18:56:54]

Done.

+  // cause a native crash (instead of the original Java crash)
+  void Abort() { should_abort_ = true; }
+  bool ShouldAbort() const { return should_abort_; }
 
   static bool RegisterBindings(JNIEnv* env);
 
  private:
+  JNIEnv* StartInternal();
+
   RunLoop* run_loop_;
   base::android::ScopedJavaGlobalRef<jobject> system_message_handler_obj_;
+  bool should_abort_;
 
   DISALLOW_COPY_AND_ASSIGN(MessagePumpForUI);
 };
 
 }  // namespace base
 
 #endif  // BASE_MESSAGE_LOOP_MESSAGE_PUMP_ANDROID_H_