diff options
| author | jam <jam@chromium.org> | 2015-09-01 15:47:05 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-09-01 22:47:37 +0000 |
| commit | 1eb5fc26f689f851ea1bc9558dee4073010caf6b (patch) | |
| tree | fc08a5c7879b645fa60606e0244d2d99a3ce154a /mojo | |
| parent | 1107ee1fe8b145904fee2b2fb416b0d7eb4c56a1 (diff) | |
| download | chromium_src-1eb5fc26f689f851ea1bc9558dee4073010caf6b.zip chromium_src-1eb5fc26f689f851ea1bc9558dee4073010caf6b.tar.gz chromium_src-1eb5fc26f689f851ea1bc9558dee4073010caf6b.tar.bz2 | |
Fix mojo_runner_unittests in debug builds.
BUG=527205
Review URL: https://codereview.chromium.org/1328563003
Cr-Commit-Position: refs/heads/master@{#346762}
Diffstat (limited to 'mojo')
| -rw-r--r-- | mojo/runner/about_fetcher_unittest.cc | 2 | ||||
| -rw-r--r-- | mojo/runner/shell_test_main.cc | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/mojo/runner/about_fetcher_unittest.cc b/mojo/runner/about_fetcher_unittest.cc index 0dfd7a1..64eb625 100644 --- a/mojo/runner/about_fetcher_unittest.cc +++ b/mojo/runner/about_fetcher_unittest.cc @@ -14,6 +14,7 @@ #include "mojo/application/public/interfaces/content_handler.mojom.h" #include "mojo/common/weak_binding_set.h" #include "mojo/runner/about_fetcher.h" +#include "mojo/runner/context.h" #include "mojo/shell/application_loader.h" #include "mojo/shell/application_manager.h" #include "testing/gtest/include/gtest/gtest.h" @@ -142,6 +143,7 @@ class AboutFetcherTest : public testing::Test { // Overridden from testing::Test: void SetUp() override { + Context::EnsureEmbedderIsInitialized(); application_manager_.reset(new shell::ApplicationManager(&test_delegate_)); application_manager_->SetLoaderForURL( make_scoped_ptr(new TestLoader(&html_content_handler_)), diff --git a/mojo/runner/shell_test_main.cc b/mojo/runner/shell_test_main.cc index 17ec7d7..9c4d1c7 100644 --- a/mojo/runner/shell_test_main.cc +++ b/mojo/runner/shell_test_main.cc @@ -11,7 +11,6 @@ #include "mojo/runner/child_process.h" #include "mojo/runner/switches.h" #include "testing/gtest/include/gtest/gtest.h" -#include "third_party/mojo/src/mojo/edk/embedder/test_embedder.h" int main(int argc, char** argv) { base::CommandLine::Init(argc, argv); @@ -26,8 +25,6 @@ int main(int argc, char** argv) { base::TestSuite test_suite(argc, argv); - mojo::embedder::test::InitWithSimplePlatformSupport(); - return base::LaunchUnitTests( argc, argv, base::Bind(&base::TestSuite::Run, base::Unretained(&test_suite))); |