Chromium Code Reviews| Index: mojo/shell/context.cc |
| diff --git a/mojo/shell/context.cc b/mojo/shell/context.cc |
| index 159e3230d5236cac5a603e8d8ead01ecc935dbf0..eb48a79b5c4b9b5fc715a4239484ed7a96684ccc 100644 |
| --- a/mojo/shell/context.cc |
| +++ b/mojo/shell/context.cc |
| @@ -83,9 +83,14 @@ class Context::NativeViewportServiceLoader : public ServiceLoader { |
| DISALLOW_COPY_AND_ASSIGN(NativeViewportServiceLoader); |
| }; |
| -Context::Context() |
| - : task_runners_(base::MessageLoop::current()->message_loop_proxy()) { |
| +Context::Context() { |
| + DCHECK(!base::MessageLoop::current()); |
|
darin (slow to review)
2014/07/28 23:02:12
perhaps the dtor should have a similar assertion?
tim (not reviewing)
2014/07/29 00:54:57
Done.
|
| +} |
| + |
| +void Context::Init() { |
| setup.Get(); |
| + task_runners_.reset( |
| + new TaskRunners(base::MessageLoop::current()->message_loop_proxy())); |
| for (size_t i = 0; i < arraysize(kLocalMojoURLs); ++i) |
| mojo_url_resolver_.AddLocalFileMapping(GURL(kLocalMojoURLs[i])); |