diff options
Diffstat (limited to 'chromium/third_party/blink/renderer/core/mojo/mojo.cc')
| -rw-r--r-- | chromium/third_party/blink/renderer/core/mojo/mojo.cc | 36 |
1 files changed, 11 insertions, 25 deletions
diff --git a/chromium/third_party/blink/renderer/core/mojo/mojo.cc b/chromium/third_party/blink/renderer/core/mojo/mojo.cc index aab3fa5cd51..28de5f1938d 100644 --- a/chromium/third_party/blink/renderer/core/mojo/mojo.cc +++ b/chromium/third_party/blink/renderer/core/mojo/mojo.cc @@ -8,16 +8,15 @@ #include <utility> #include "mojo/public/cpp/system/message_pipe.h" -#include "services/service_manager/public/cpp/interface_provider.h" -#include "third_party/blink/public/platform/interface_provider.h" +#include "third_party/blink/public/common/thread_safe_browser_interface_broker_proxy.h" #include "third_party/blink/public/platform/platform.h" +#include "third_party/blink/renderer/bindings/core/v8/v8_mojo_create_data_pipe_options.h" +#include "third_party/blink/renderer/bindings/core/v8/v8_mojo_create_data_pipe_result.h" +#include "third_party/blink/renderer/bindings/core/v8/v8_mojo_create_message_pipe_result.h" +#include "third_party/blink/renderer/bindings/core/v8/v8_mojo_create_shared_buffer_result.h" #include "third_party/blink/renderer/core/dom/document.h" #include "third_party/blink/renderer/core/frame/local_frame.h" #include "third_party/blink/renderer/core/frame/local_frame_client.h" -#include "third_party/blink/renderer/core/mojo/mojo_create_data_pipe_options.h" -#include "third_party/blink/renderer/core/mojo/mojo_create_data_pipe_result.h" -#include "third_party/blink/renderer/core/mojo/mojo_create_message_pipe_result.h" -#include "third_party/blink/renderer/core/mojo/mojo_create_shared_buffer_result.h" #include "third_party/blink/renderer/core/mojo/mojo_handle.h" #include "third_party/blink/renderer/core/workers/worker_global_scope.h" #include "third_party/blink/renderer/core/workers/worker_thread.h" @@ -98,33 +97,20 @@ MojoCreateSharedBufferResult* Mojo::createSharedBuffer(unsigned num_bytes) { void Mojo::bindInterface(ScriptState* script_state, const String& interface_name, MojoHandle* request_handle, - const String& scope, - bool use_browser_interface_broker) { + const String& scope) { std::string name = interface_name.Utf8(); auto handle = mojo::ScopedMessagePipeHandle::From(request_handle->TakeHandle()); if (scope == "process") { - Platform::Current()->GetInterfaceProvider()->GetInterface( - name.c_str(), std::move(handle)); + Platform::Current()->GetBrowserInterfaceBroker()->GetInterface( + mojo::GenericPendingReceiver(name, std::move(handle))); return; } - // This should replace InterfaceProvider usage below when all - // InterfaceProvider clients are converted to use BrowserInterfaceBroker. See - // crbug.com/936482. - if (use_browser_interface_broker) { - ExecutionContext::From(script_state) - ->GetBrowserInterfaceBroker() - .GetInterface(name, std::move(handle)); - return; - } - - // TODO(crbug.com/995556): remove when no longer used. - if (auto* interface_provider = - ExecutionContext::From(script_state)->GetInterfaceProvider()) { - interface_provider->GetInterfaceByName(name, std::move(handle)); - } + ExecutionContext::From(script_state) + ->GetBrowserInterfaceBroker() + .GetInterface(name, std::move(handle)); } } // namespace blink |