| Index: third_party/mojo/src/mojo/public/cpp/environment/lib/environment.cc
|
| diff --git a/third_party/mojo/src/mojo/public/cpp/environment/lib/environment.cc b/third_party/mojo/src/mojo/public/cpp/environment/lib/environment.cc
|
| index 6fb7e22a2204ef57185897050d743391b5a1684a..8c7c930671d825cd7624899f72880548d72d4ae0 100644
|
| --- a/third_party/mojo/src/mojo/public/cpp/environment/lib/environment.cc
|
| +++ b/third_party/mojo/src/mojo/public/cpp/environment/lib/environment.cc
|
| @@ -9,6 +9,7 @@
|
| #include "mojo/public/c/environment/logger.h"
|
| #include "mojo/public/cpp/environment/lib/default_async_waiter.h"
|
| #include "mojo/public/cpp/environment/lib/default_logger.h"
|
| +#include "mojo/public/cpp/environment/lib/default_task_tracker.h"
|
| #include "mojo/public/cpp/utility/run_loop.h"
|
|
|
| namespace mojo {
|
| @@ -17,27 +18,34 @@ namespace {
|
|
|
| const MojoAsyncWaiter* g_default_async_waiter = nullptr;
|
| const MojoLogger* g_default_logger = nullptr;
|
| +const TaskTracker* g_default_task_tracker = nullptr;
|
|
|
| void Init(const MojoAsyncWaiter* default_async_waiter,
|
| - const MojoLogger* default_logger) {
|
| + const MojoLogger* default_logger,
|
| + const TaskTracker* default_task_tracker) {
|
| g_default_async_waiter = default_async_waiter
|
| ? default_async_waiter
|
| : &internal::kDefaultAsyncWaiter;
|
| g_default_logger =
|
| default_logger ? default_logger : &internal::kDefaultLogger;
|
|
|
| + g_default_task_tracker = default_task_tracker
|
| + ? default_task_tracker
|
| + : &internal::kDefaultTaskTracker;
|
| +
|
| RunLoop::SetUp();
|
| }
|
|
|
| } // namespace
|
|
|
| Environment::Environment() {
|
| - Init(nullptr, nullptr);
|
| + Init(nullptr, nullptr, nullptr);
|
| }
|
|
|
| Environment::Environment(const MojoAsyncWaiter* default_async_waiter,
|
| - const MojoLogger* default_logger) {
|
| - Init(default_async_waiter, default_logger);
|
| + const MojoLogger* default_logger,
|
| + const TaskTracker* default_task_tracker) {
|
| + Init(default_async_waiter, default_logger, default_task_tracker);
|
| }
|
|
|
| Environment::~Environment() {
|
| @@ -62,6 +70,11 @@ const MojoLogger* Environment::GetDefaultLogger() {
|
| }
|
|
|
| // static
|
| +const TaskTracker* Environment::GetDefaultTaskTracker() {
|
| + return g_default_task_tracker;
|
| +}
|
| +
|
| +// static
|
| void Environment::InstantiateDefaultRunLoop() {
|
| assert(!RunLoop::current());
|
| // Not leaked: accessible from |RunLoop::current()|.
|
|
|