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

Side by Side Diff: content/test/run_all_unittests.cc

Issue 2202793002: base: Remove unneeded RegisterNatives() calls on Android (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@jnireg2
Patch Set: rebase 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 unified diff | Download patch
« no previous file with comments | « blimp/test/run_all_unittests.cc ('k') | ipc/run_all_unittests.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/bind.h" 5 #include "base/bind.h"
6 #include "base/command_line.h" 6 #include "base/command_line.h"
7 #include "base/test/launcher/unit_test_launcher.h" 7 #include "base/test/launcher/unit_test_launcher.h"
8 #include "base/test/test_io_thread.h" 8 #include "base/test/test_io_thread.h"
9 #include "build/build_config.h" 9 #include "build/build_config.h"
10 #include "content/app/mojo/mojo_init.h" 10 #include "content/app/mojo/mojo_init.h"
11 #include "content/public/test/unittest_test_suite.h" 11 #include "content/public/test/unittest_test_suite.h"
12 #include "content/test/content_test_suite.h" 12 #include "content/test/content_test_suite.h"
13 #include "mojo/edk/test/scoped_ipc_support.h" 13 #include "mojo/edk/test/scoped_ipc_support.h"
14 14
15 #if defined(OS_ANDROID)
16 #include "base/android/jni_android.h"
17 #include "base/test/test_file_util.h"
18 #include "content/browser/gpu/browser_gpu_channel_host_factory.h"
19 #endif
20
21 int main(int argc, char** argv) { 15 int main(int argc, char** argv) {
22 #if defined(OS_ANDROID)
23 // Register JNI bindings for android.
24 base::RegisterContentUriTestUtils(base::android::AttachCurrentThread());
25 #endif
26 content::UnitTestTestSuite test_suite( 16 content::UnitTestTestSuite test_suite(
27 new content::ContentTestSuite(argc, argv)); 17 new content::ContentTestSuite(argc, argv));
28 content::InitializeMojo(); 18 content::InitializeMojo();
29 base::TestIOThread test_io_thread(base::TestIOThread::kAutoStart); 19 base::TestIOThread test_io_thread(base::TestIOThread::kAutoStart);
30 std::unique_ptr<mojo::edk::test::ScopedIPCSupport> ipc_support; 20 std::unique_ptr<mojo::edk::test::ScopedIPCSupport> ipc_support;
31 ipc_support.reset( 21 ipc_support.reset(
32 new mojo::edk::test::ScopedIPCSupport(test_io_thread.task_runner())); 22 new mojo::edk::test::ScopedIPCSupport(test_io_thread.task_runner()));
33 23
34 return base::LaunchUnitTests( 24 return base::LaunchUnitTests(
35 argc, argv, base::Bind(&content::UnitTestTestSuite::Run, 25 argc, argv, base::Bind(&content::UnitTestTestSuite::Run,
36 base::Unretained(&test_suite))); 26 base::Unretained(&test_suite)));
37 } 27 }
OLDNEW
« no previous file with comments | « blimp/test/run_all_unittests.cc ('k') | ipc/run_all_unittests.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698