diff options
| author | sky <sky@chromium.org> | 2016-02-25 09:47:21 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-02-25 17:49:01 +0000 |
| commit | 3c532042611fff5217c3be73923b9473e2b67dbe (patch) | |
| tree | b8becc7ef0405e8494a692f2b8b1653cfbad59c7 /mojo/shell/background | |
| parent | 263828193c946e3e6e6a9aae32c412eba4ad5772 (diff) | |
| download | chromium_src-3c532042611fff5217c3be73923b9473e2b67dbe.zip chromium_src-3c532042611fff5217c3be73923b9473e2b67dbe.tar.gz chromium_src-3c532042611fff5217c3be73923b9473e2b67dbe.tar.bz2 | |
Gets views_mus_unittests working again
The sets of tests that are run now pass. Will continue to add tests as they start passing.
BUG=577274
TEST=covered by tests
R=ben@chromium.org
Review URL: https://codereview.chromium.org/1740513002
Cr-Commit-Position: refs/heads/master@{#377606}
Diffstat (limited to 'mojo/shell/background')
| -rw-r--r-- | mojo/shell/background/background_shell.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/mojo/shell/background/background_shell.cc b/mojo/shell/background/background_shell.cc index 3ba1203..7afef7a 100644 --- a/mojo/shell/background/background_shell.cc +++ b/mojo/shell/background/background_shell.cc @@ -125,9 +125,11 @@ class BackgroundShell::MojoThread : public base::SimpleThread { context_ = context.get(); scoped_ptr<mojo::shell::Context::InitParams> context_init_params( new mojo::shell::Context::InitParams); - context_init_params->app_catalog = std::move(init_params_->app_catalog); - context_init_params->native_runner_delegate = - init_params_->native_runner_delegate; + if (init_params_) { + context_init_params->app_catalog = std::move(init_params_->app_catalog); + context_init_params->native_runner_delegate = + init_params_->native_runner_delegate; + } context_->Init(std::move(context_init_params)); message_loop_->Run(); |