diff options
| -rw-r--r-- | mojo/environment/BUILD.gn | 13 | ||||
| -rw-r--r-- | mojo/environment/default_run_loop_impl.cc | 6 | ||||
| -rw-r--r-- | mojo/mojo_base.gyp | 3 |
3 files changed, 20 insertions, 2 deletions
diff --git a/mojo/environment/BUILD.gn b/mojo/environment/BUILD.gn index d08ca62..24df858 100644 --- a/mojo/environment/BUILD.gn +++ b/mojo/environment/BUILD.gn @@ -10,6 +10,8 @@ source_set("chromium") { "environment.cc", # TODO(vtl): This is kind of ugly. (See TODO in logging.h.) + "//third_party/mojo/src/mojo/public/cpp/environment/async_waiter.h", + "//third_party/mojo/src/mojo/public/cpp/environment/lib/async_waiter.cc", "//third_party/mojo/src/mojo/public/cpp/environment/logging.h", "//third_party/mojo/src/mojo/public/cpp/environment/lib/logging.cc", ] @@ -17,6 +19,13 @@ source_set("chromium") { public_deps = [ ":chromium_impl", ] + + deps = [ + "//third_party/mojo/src/mojo/public/c/environment", + "//third_party/mojo/src/mojo/public/cpp/bindings:callback", + "//third_party/mojo/src/mojo/public/cpp/environment", + "//third_party/mojo/src/mojo/public/cpp/system", + ] } # GYP version: mojo_base.gyp:mojo_environment_chromium_impl @@ -35,11 +44,13 @@ component("chromium_impl") { defines = [ "MOJO_ENVIRONMENT_IMPL_IMPLEMENTATION" ] - public_configs = [ "//third_party/mojo/src/mojo/public/build/config:mojo_sdk" ] + public_configs = + [ "//third_party/mojo/src/mojo/public/build/config:mojo_sdk" ] deps = [ "//base", "//base/third_party/dynamic_annotations", "//mojo/common", + "//third_party/mojo/src/mojo/public/c/environment", ] } diff --git a/mojo/environment/default_run_loop_impl.cc b/mojo/environment/default_run_loop_impl.cc index 07037b7..4fa9ffd 100644 --- a/mojo/environment/default_run_loop_impl.cc +++ b/mojo/environment/default_run_loop_impl.cc @@ -11,12 +11,16 @@ namespace mojo { namespace internal { void InstantiateDefaultRunLoopImpl() { + CHECK(!base::MessageLoop::current()); // Not leaked: accessible from |base::MessageLoop::current()|. - new base::MessageLoop(); + base::MessageLoop* message_loop = new base::MessageLoop(); + CHECK_EQ(message_loop, base::MessageLoop::current()); } void DestroyDefaultRunLoopImpl() { + CHECK(base::MessageLoop::current()); delete base::MessageLoop::current(); + CHECK(!base::MessageLoop::current()); } } // namespace internal diff --git a/mojo/mojo_base.gyp b/mojo/mojo_base.gyp index 2000120..c0d4bac 100644 --- a/mojo/mojo_base.gyp +++ b/mojo/mojo_base.gyp @@ -95,10 +95,13 @@ 'type': 'static_library', 'dependencies': [ 'mojo_environment_chromium_impl', + '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings', ], 'sources': [ 'environment/environment.cc', # TODO(vtl): This is kind of ugly. (See TODO in logging.h.) + "../third_party/mojo/src/mojo/public/cpp/environment/async_waiter.h", + "../third_party/mojo/src/mojo/public/cpp/environment/lib/async_waiter.cc", "../third_party/mojo/src/mojo/public/cpp/environment/logging.h", "../third_party/mojo/src/mojo/public/cpp/environment/lib/logging.cc", ], |