| Index: third_party/WebKit/Source/modules/broadcastchannel/BroadcastChannel.cpp
|
| diff --git a/third_party/WebKit/Source/modules/broadcastchannel/BroadcastChannel.cpp b/third_party/WebKit/Source/modules/broadcastchannel/BroadcastChannel.cpp
|
| index d4e555ebbb557e046ab38724366b7c1f2eacdd8b..676b82350874c1fa2f0589241ac0d461aeeba4c6 100644
|
| --- a/third_party/WebKit/Source/modules/broadcastchannel/BroadcastChannel.cpp
|
| +++ b/third_party/WebKit/Source/modules/broadcastchannel/BroadcastChannel.cpp
|
| @@ -22,9 +22,9 @@ namespace {
|
| // connection as basis for all connections to channels from the same thread. The
|
| // actual connections used to send/receive messages are then created using
|
| // associated interfaces, ensuring proper message ordering.
|
| -webmessaging::mojom::blink::BroadcastChannelProviderPtr& getThreadSpecificProvider()
|
| +mojom::blink::BroadcastChannelProviderPtr& getThreadSpecificProvider()
|
| {
|
| - DEFINE_THREAD_SAFE_STATIC_LOCAL(ThreadSpecific<webmessaging::mojom::blink::BroadcastChannelProviderPtr>, provider, new ThreadSpecific<webmessaging::mojom::blink::BroadcastChannelProviderPtr>);
|
| + DEFINE_THREAD_SAFE_STATIC_LOCAL(ThreadSpecific<mojom::blink::BroadcastChannelProviderPtr>, provider, new ThreadSpecific<mojom::blink::BroadcastChannelProviderPtr>);
|
| if (!provider.isSet()) {
|
| Platform::current()->serviceRegistry()->connectToRemoteService(mojo::GetProxy(&*provider));
|
| }
|
| @@ -118,16 +118,16 @@ BroadcastChannel::BroadcastChannel(ExecutionContext* executionContext, const Str
|
| , m_name(name)
|
| , m_binding(this)
|
| {
|
| - webmessaging::mojom::blink::BroadcastChannelProviderPtr& provider = getThreadSpecificProvider();
|
| + mojom::blink::BroadcastChannelProviderPtr& provider = getThreadSpecificProvider();
|
|
|
| // Local BroadcastChannelClient for messages send from the browser to this channel.
|
| - webmessaging::mojom::blink::BroadcastChannelClientAssociatedPtrInfo localClientInfo;
|
| + mojom::blink::BroadcastChannelClientAssociatedPtrInfo localClientInfo;
|
| m_binding.Bind(&localClientInfo, provider.associated_group());
|
| m_binding.set_connection_error_handler(convertToBaseCallback(WTF::bind(&BroadcastChannel::onError, wrapWeakPersistent(this))));
|
|
|
| // Remote BroadcastChannelClient for messages send from this channel to the browser.
|
| - webmessaging::mojom::blink::BroadcastChannelClientAssociatedPtrInfo remoteClientInfo;
|
| - mojo::AssociatedInterfaceRequest<webmessaging::mojom::blink::BroadcastChannelClient> remoteCientRequest;
|
| + mojom::blink::BroadcastChannelClientAssociatedPtrInfo remoteClientInfo;
|
| + mojo::AssociatedInterfaceRequest<mojom::blink::BroadcastChannelClient> remoteCientRequest;
|
| provider.associated_group()->CreateAssociatedInterface(mojo::AssociatedGroup::WILL_PASS_REQUEST, &remoteClientInfo, &remoteCientRequest);
|
| m_remoteClient.Bind(std::move(remoteClientInfo));
|
| m_remoteClient.set_connection_error_handler(convertToBaseCallback(WTF::bind(&BroadcastChannel::onError, wrapWeakPersistent(this))));
|
|
|