Commit 41fba725 authored by Misha Efimov's avatar Misha Efimov Committed by Commit Bot

[Cronet] Change cronet_tests on desktop to use cronet implementation.

Bug: 744567
Cq-Include-Trybots: luci.chromium.try:ios-simulator-cronet;master.tryserver.chromium.android:android_cronet_tester
Change-Id: I34b5f7c5446ab88a6a66acad8c77c99a8dcb984b
Reviewed-on: https://chromium-review.googlesource.com/1191464Reviewed-by: default avatarWez <wez@chromium.org>
Commit-Queue: Misha Efimov <mef@chromium.org>
Cr-Commit-Position: refs/heads/master@{#588893}
parent 01d5917a
......@@ -105,13 +105,16 @@ if (!is_ios && !is_android) {
test("cronet_tests") {
deps = [
":cronet",
":cronet_common",
"//base",
"//base/test:test_support",
"//components/cronet/native:cronet_native_impl",
"//components/cronet/native/test:cronet_native_tests",
"//net",
]
sources = [
"cronet_global_state_stubs.cc",
"run_all_unittests.cc",
]
......
......@@ -21,12 +21,9 @@ namespace cronet {
namespace {
scoped_refptr<base::SingleThreadTaskRunner> InitializeAndCreateTaskRunner() {
// TODO(https://crbug.com/816705): Component builds result in //base and other
// process-global state being shared between the library and the test suite.
// Since we only expect Cronet native library component build to be used to run
// cronet_tests, we can assume that suite will define some things, for now.
#if !defined(COMPONENT_BUILD)
// TODO(wez): Remove this once AtExitManager dependencies are gone.
// Cronet tests sets AtExitManager as part of TestSuite, so statically linked
// library is not allowed to set its own.
#if !defined(CRONET_TESTS_IMPLEMENTATION)
ignore_result(new base::AtExitManager);
#endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment