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/renderer | |
| 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/renderer')
| -rw-r--r-- | extensions/renderer/BUILD.gn | 2 | ||||
| -rw-r--r-- | extensions/renderer/DEPS | 2 | ||||
| -rw-r--r-- | extensions/renderer/api/serial/data_receiver_unittest.cc | 1 | ||||
| -rw-r--r-- | extensions/renderer/api_test_base.cc | 16 | ||||
| -rw-r--r-- | extensions/renderer/api_test_base.h | 1 |
5 files changed, 10 insertions, 12 deletions
diff --git a/extensions/renderer/BUILD.gn b/extensions/renderer/BUILD.gn index 7ed31fe..9606e85 100644 --- a/extensions/renderer/BUILD.gn +++ b/extensions/renderer/BUILD.gn @@ -26,9 +26,9 @@ source_set("renderer") { "//content:resources", "//extensions:extensions_resources", "//gin", + "//mojo/edk/js", "//mojo/public/js", "//skia", "//third_party/WebKit/public:blink", - "//third_party/mojo/src/mojo/edk/js", ] } diff --git a/extensions/renderer/DEPS b/extensions/renderer/DEPS index 5a27869..bd0ed52 100644 --- a/extensions/renderer/DEPS +++ b/extensions/renderer/DEPS @@ -4,7 +4,7 @@ include_rules = [ "+content/public/renderer", "+gin", - "+third_party/mojo/src/mojo/edk/js", + "+mojo/edk/js", "+third_party/skia/include/core", "+third_party/cld_2/src/public/compact_lang_det.h", diff --git a/extensions/renderer/api/serial/data_receiver_unittest.cc b/extensions/renderer/api/serial/data_receiver_unittest.cc index 126b041..0827a8a 100644 --- a/extensions/renderer/api/serial/data_receiver_unittest.cc +++ b/extensions/renderer/api/serial/data_receiver_unittest.cc @@ -14,6 +14,7 @@ #include "gin/dictionary.h" #include "gin/wrappable.h" #include "grit/extensions_renderer_resources.h" +#include "mojo/edk/js/handle.h" namespace extensions { diff --git a/extensions/renderer/api_test_base.cc b/extensions/renderer/api_test_base.cc index 3ce3d5d..abf868b 100644 --- a/extensions/renderer/api_test_base.cc +++ b/extensions/renderer/api_test_base.cc @@ -13,11 +13,11 @@ #include "extensions/renderer/process_info_native_handler.h" #include "gin/converter.h" #include "gin/dictionary.h" +#include "mojo/edk/js/core.h" +#include "mojo/edk/js/handle.h" +#include "mojo/edk/js/support.h" #include "mojo/public/cpp/bindings/interface_request.h" #include "mojo/public/cpp/system/core.h" -#include "third_party/mojo/src/mojo/edk/js/core.h" -#include "third_party/mojo/src/mojo/edk/js/handle.h" -#include "third_party/mojo/src/mojo/edk/js/support.h" namespace extensions { namespace { @@ -155,13 +155,11 @@ void ApiTestEnvironment::RegisterModules() { "exports.$set('MatchAgainstEventFilter', function() { return [] });"); gin::ModuleRegistry::From(env()->context()->v8_context()) - ->AddBuiltinModule(env()->isolate(), - mojo::js::Core::kModuleName, - mojo::js::Core::GetModule(env()->isolate())); + ->AddBuiltinModule(env()->isolate(), mojo::edk::js::Core::kModuleName, + mojo::edk::js::Core::GetModule(env()->isolate())); gin::ModuleRegistry::From(env()->context()->v8_context()) - ->AddBuiltinModule(env()->isolate(), - mojo::js::Support::kModuleName, - mojo::js::Support::GetModule(env()->isolate())); + ->AddBuiltinModule(env()->isolate(), mojo::edk::js::Support::kModuleName, + mojo::edk::js::Support::GetModule(env()->isolate())); gin::Handle<TestServiceProvider> service_provider = TestServiceProvider::Create(env()->isolate()); service_provider_ = service_provider.get(); diff --git a/extensions/renderer/api_test_base.h b/extensions/renderer/api_test_base.h index 2bfc4cc..8b62049 100644 --- a/extensions/renderer/api_test_base.h +++ b/extensions/renderer/api_test_base.h @@ -19,7 +19,6 @@ #include "gin/wrappable.h" #include "mojo/public/cpp/bindings/interface_request.h" #include "mojo/public/cpp/system/core.h" -#include "third_party/mojo/src/mojo/edk/js/handle.h" namespace extensions { |