Properly throw java exceptions from shouldOverrideUrlLoading

base/android/java_handler_thread.cc

 // Copyright 2013 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.
 
 #include "base/android/java_handler_thread.h"
 
 #include <jni.h>
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
@@ skipping 17 matching lines @@
 }
 
 void JavaHandlerThread::Start() {
   // Check the thread has not already been started.
   DCHECK(!message_loop_);
 
   JNIEnv* env = base::android::AttachCurrentThread();
   base::WaitableEvent initialize_event(
       WaitableEvent::ResetPolicy::AUTOMATIC,
       WaitableEvent::InitialState::NOT_SIGNALED);
-  Java_JavaHandlerThread_start(env,
-                               java_thread_.obj(),
+  Java_JavaHandlerThread_start(env, java_thread_.obj(),
                                reinterpret_cast<intptr_t>(this),
                                reinterpret_cast<intptr_t>(&initialize_event));
   // Wait for thread to be initialized so it is ready to be used when Start
   // returns.
   base::ThreadRestrictions::ScopedAllowWait wait_allowed;
   initialize_event.Wait();
 }
 
 void JavaHandlerThread::Stop() {
   JNIEnv* env = base::android::AttachCurrentThread();
   base::WaitableEvent shutdown_event(WaitableEvent::ResetPolicy::AUTOMATIC,
                                      WaitableEvent::InitialState::NOT_SIGNALED);
   Java_JavaHandlerThread_stop(env,
                               java_thread_.obj(),
                               reinterpret_cast<intptr_t>(this),
                               reinterpret_cast<intptr_t>(&shutdown_event));
   // Wait for thread to shut down before returning.
   base::ThreadRestrictions::ScopedAllowWait wait_allowed;
   shutdown_event.Wait();
 }
 
 void JavaHandlerThread::InitializeThread(JNIEnv* env,
                                          const JavaParamRef<jobject>& obj,
                                          jlong event) {
   // TYPE_JAVA to get the Android java style message loop.
   message_loop_.reset(new base::MessageLoop(base::MessageLoop::TYPE_JAVA));
-  static_cast<MessageLoopForUI*>(message_loop_.get())->Start();
+  StartMessageLoop();
   reinterpret_cast<base::WaitableEvent*>(event)->Signal();
 }
 
 void JavaHandlerThread::StopThread(JNIEnv* env,
                                    const JavaParamRef<jobject>& obj,
                                    jlong event) {
+  StopMessageLoop();
+  reinterpret_cast<base::WaitableEvent*>(event)->Signal();
+}
+
+void JavaHandlerThread::StartMessageLoop() {
+  static_cast<MessageLoopForUI*>(message_loop_.get())->Start();
+}
+
+void JavaHandlerThread::StopMessageLoop() {
   static_cast<MessageLoopForUI*>(message_loop_.get())->QuitWhenIdle();
-  reinterpret_cast<base::WaitableEvent*>(event)->Signal();
 }
 
 // static
 bool JavaHandlerThread::RegisterBindings(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 } // namespace android
 } // namespace base