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/api_test_base.cc | |
| 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/api_test_base.cc')
| -rw-r--r-- | extensions/renderer/api_test_base.cc | 16 |
1 files changed, 7 insertions, 9 deletions
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(); |