diff options
| author | rockot <rockot@chromium.org> | 2016-02-10 01:57:08 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-02-10 09:58:42 +0000 |
| commit | c637caf9bac4b86535f19765ae91be2bc8467925 (patch) | |
| tree | 550308031b8ecc3ce3cafb00e4f5d82b34b3c3f9 /extensions/test | |
| parent | 4104d6998090894fca07949ef4d5d001c19ba051 (diff) | |
| download | chromium_src-c637caf9bac4b86535f19765ae91be2bc8467925.zip chromium_src-c637caf9bac4b86535f19765ae91be2bc8467925.tar.gz chromium_src-c637caf9bac4b86535f19765ae91be2bc8467925.tar.bz2 | |
[mojo] Delete third_party/mojo
All users are on the new EDK now. This wipes out third_party/mojo,
updates all dependencies, and removes the use-new-edk flag.
BUG=None
Review URL: https://codereview.chromium.org/1676913002
Cr-Commit-Position: refs/heads/master@{#374631}
Diffstat (limited to 'extensions/test')
| -rw-r--r-- | extensions/test/DEPS | 2 | ||||
| -rw-r--r-- | extensions/test/extensions_unittests_main.cc | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/extensions/test/DEPS b/extensions/test/DEPS index b334588..27ef4ea 100644 --- a/extensions/test/DEPS +++ b/extensions/test/DEPS @@ -1,5 +1,5 @@ include_rules = [ "+content/public", - "+third_party/mojo/src/mojo/edk/embedder", + "+mojo/edk/embedder", "+ui/gl", ] diff --git a/extensions/test/extensions_unittests_main.cc b/extensions/test/extensions_unittests_main.cc index ac9e8dd..bb9cc00 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/embedder.h" +#include "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::Init(); + mojo::edk::Init(); return base::LaunchUnitTests(argc, argv, base::Bind(&content::UnitTestTestSuite::Run, |