| Index: extensions/renderer/api_test_base.cc
|
| diff --git a/extensions/renderer/api_test_base.cc b/extensions/renderer/api_test_base.cc
|
| index c71e843f16c25870976c3600a42a02024328a709..a7c09f66ff3e13630590fa6656ab8d46f7c33d4a 100644
|
| --- a/extensions/renderer/api_test_base.cc
|
| +++ b/extensions/renderer/api_test_base.cc
|
| @@ -18,11 +18,17 @@
|
| #include "gin/converter.h"
|
| #include "gin/dictionary.h"
|
| #include "gin/modules/console.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/WebKit/public/web/WebMojoBindings.h"
|
| +
|
| +namespace gin {
|
| +template <>
|
| +struct Converter<mojo::Handle> {
|
| + static v8::Handle<v8::Value> ToV8(v8::Isolate* isolate, mojo::Handle val) {
|
| + return blink::WebMojoBindings::wrap(isolate->GetCurrentContext(),
|
| + mojo::MakeScopedHandle(val));
|
| + }
|
| +};
|
| +} // namespace gin
|
|
|
| namespace extensions {
|
| namespace {
|
| @@ -156,12 +162,6 @@ void ApiTestEnvironment::RegisterModules() {
|
| gin::ModuleRegistry::From(env()->context()->v8_context())
|
| ->AddBuiltinModule(env()->isolate(), gin::Console::kModuleName,
|
| gin::Console::GetModule(env()->isolate()));
|
| - gin::ModuleRegistry::From(env()->context()->v8_context())
|
| - ->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::edk::js::Support::kModuleName,
|
| - mojo::edk::js::Support::GetModule(env()->isolate()));
|
| gin::Handle<TestInterfaceProvider> interface_provider =
|
| TestInterfaceProvider::Create(env()->isolate());
|
| interface_provider_ = interface_provider.get();
|
|
|