Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3006)

Unified Diff: base/run_all_base_unittests.cc

Issue 2169553002: Properly throw java exceptions from shouldOverrideUrlLoading (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove unused includes in test_support_android.cc. Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: base/run_all_base_unittests.cc
diff --git a/blimp/test/run_all_unittests.cc b/base/run_all_base_unittests.cc
similarity index 53%
copy from blimp/test/run_all_unittests.cc
copy to base/run_all_base_unittests.cc
index 36b040c2d6f2f2da8dfec018cf299ab6ca1f7d80..1d8d96326869ee02d71d78c52246e23c76a94e95 100644
--- a/blimp/test/run_all_unittests.cc
+++ b/base/run_all_base_unittests.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright (c) 2016 The Chromium Authors. All rights reserved.
nyquist 2016/08/18 15:50:02 Nit: No (c) here or in any other added file.
gsennton 2016/08/18 18:56:54 Done.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -6,10 +6,18 @@
#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)
danakj 2016/08/18 17:50:16 And plz move this file to base/test/ also
gsennton 2016/08/18 18:56:54 Done.
+#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(
+ base::android::AttachCurrentThread());
+#endif // defined(OS_ANDROID)
+
base::TestSuite test_suite(argc, argv);
return base::LaunchUnitTests(
argc, argv,

Powered by Google App Engine
This is Rietveld 408576698