diff options
| author | jam <jam@chromium.org> | 2015-10-02 14:01:28 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-10-02 21:02:13 +0000 |
| commit | 76bcf0c21e332c08ee7a1601d0c878d1c75541a0 (patch) | |
| tree | 9a1070172b98a5c0775967858a07d55585751839 /extensions/test | |
| parent | be81c48e3a52a050a6d07d0eb558a41c02594e6e (diff) | |
| download | chromium_src-76bcf0c21e332c08ee7a1601d0c878d1c75541a0.zip chromium_src-76bcf0c21e332c08ee7a1601d0c878d1c75541a0.tar.gz chromium_src-76bcf0c21e332c08ee7a1601d0c878d1c75541a0.tar.bz2 | |
Add a Mojo EDK for Chrome that uses one OS pipe per message pipe.
TODOs in future cls:
-POSIX
-use shared memory for MessagePipeDispatcher serialization
-work in Windows sandbox (using master.mojom which is implemented but not hooked up in this change)
-XP
BUG=478251
NOPRESUBMIT=true
Review URL: https://codereview.chromium.org/1350023003
Cr-Commit-Position: refs/heads/master@{#352123}
Diffstat (limited to 'extensions/test')
| -rw-r--r-- | extensions/test/extensions_unittests_main.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/extensions/test/extensions_unittests_main.cc b/extensions/test/extensions_unittests_main.cc index f39e40d..ac9e8dd 100644 --- a/extensions/test/extensions_unittests_main.cc +++ b/extensions/test/extensions_unittests_main.cc @@ -13,7 +13,7 @@ #include "extensions/common/constants.h" #include "extensions/common/extension_paths.h" #include "extensions/test/test_extensions_client.h" -#include "third_party/mojo/src/mojo/edk/embedder/test_embedder.h" +#include "third_party/mojo/src/mojo/edk/embedder/embedder.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gl/test/gl_surface_test_support.h" #include "url/url_util.h" @@ -110,7 +110,7 @@ void ExtensionsTestSuite::Shutdown() { int main(int argc, char** argv) { content::UnitTestTestSuite test_suite(new ExtensionsTestSuite(argc, argv)); - mojo::embedder::test::InitWithSimplePlatformSupport(); + mojo::embedder::Init(); return base::LaunchUnitTests(argc, argv, base::Bind(&content::UnitTestTestSuite::Run, |