Properly throw java exceptions from shouldOverrideUrlLoading

base/run_all_base_unittests.cc

-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright (c) 2016 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/bind.h"
 #include "base/test/launcher/unit_test_launcher.h"
 #include "base/test/test_suite.h"
 #include "build/build_config.h"
-#include "mojo/edk/embedder/embedder.h"
+
+#if defined(OS_ANDROID)
+#include "base/android/jni_android.h"
+#include "base/test/android/test_system_message_handler_link_android.h"
+#endif  // defined(OS_ANDROID)
 
 int main(int argc, char** argv) {
-  mojo::edk::Init();
+#if defined(OS_ANDROID)
+  base::android::TestSystemMessageHandlerLink::RegisterJNI(

[gsennton, 2016/08/18 13:03:09]

Added this to register the jni bindings only in base_unittests - PS 8 fails
because it tries to add bindings for TestSystemMessageHandler to a lot of other
components that do not include the TestSystemMessageHandler.java class.

+      base::android::AttachCurrentThread());
+#endif  // defined(OS_ANDROID)
+
   base::TestSuite test_suite(argc, argv);
   return base::LaunchUnitTests(
       argc, argv,
       base::Bind(&base::TestSuite::Run, base::Unretained(&test_suite)));
 }