Convert mojom::WebContentsBindingSet to new Mojo types
This CL converts mojom::WebContentsBindingSet to new Mojo types using
AssociatedReceiverSet instead of AssociatedBindingSet.
It renames WebContentsBindingSet to WebContentsReceiverSet and
web_contents_binding_set.{cc,h} to web_contents_receiver_set.{cc,h}.
It doesn't change the previous behavior.
Bug: 955171
Change-Id: I6b623a8710103c9c13f6971e67fc501252518400
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1933847
Reviewed-by: Colin Blundell <[email protected]>
Reviewed-by: Avi Drissman <[email protected]>
Reviewed-by: Wez <[email protected]>
Reviewed-by: Kinuko Yasuda <[email protected]>
Reviewed-by: Ken Rockot <[email protected]>
Commit-Queue: Julie Kim <[email protected]>
Cr-Commit-Position: refs/heads/master@{#721336}
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index 343312cd..3a5aa31d 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -123,8 +123,8 @@
#include "content/public/browser/ssl_status.h"
#include "content/public/browser/storage_partition.h"
#include "content/public/browser/system_connector.h"
-#include "content/public/browser/web_contents_binding_set.h"
#include "content/public/browser/web_contents_delegate.h"
+#include "content/public/browser/web_contents_receiver_set.h"
#include "content/public/browser/web_ui_controller.h"
#include "content/public/common/bindings_policy.h"
#include "content/public/common/child_process_host.h"
@@ -634,8 +634,8 @@
rwh_input_event_router_.reset();
- for (auto& entry : binding_sets_)
- entry.second->CloseAllBindings();
+ for (auto& entry : receiver_sets_)
+ entry.second->CloseAllReceivers();
WebContentsImpl* outermost = GetOutermostWebContents();
if (this != outermost && ContainsOrIsFocusedWebContents()) {
@@ -1217,20 +1217,20 @@
}
#endif // !defined(OS_ANDROID)
-base::OnceClosure WebContentsImpl::AddBindingSet(
+base::OnceClosure WebContentsImpl::AddReceiverSet(
const std::string& interface_name,
- WebContentsBindingSet* binding_set) {
+ WebContentsReceiverSet* receiver_set) {
auto result =
- binding_sets_.insert(std::make_pair(interface_name, binding_set));
+ receiver_sets_.insert(std::make_pair(interface_name, receiver_set));
DCHECK(result.second);
- return base::BindOnce(&WebContentsImpl::RemoveBindingSet,
+ return base::BindOnce(&WebContentsImpl::RemoveReceiverSet,
weak_factory_.GetWeakPtr(), interface_name);
}
-WebContentsBindingSet* WebContentsImpl::GetBindingSet(
+WebContentsReceiverSet* WebContentsImpl::GetReceiverSet(
const std::string& interface_name) {
- auto it = binding_sets_.find(interface_name);
- if (it == binding_sets_.end())
+ auto it = receiver_sets_.find(interface_name);
+ if (it == receiver_sets_.end())
return nullptr;
return it->second;
}
@@ -5372,9 +5372,9 @@
RenderFrameHost* render_frame_host,
const std::string& interface_name,
mojo::ScopedInterfaceEndpointHandle handle) {
- auto it = binding_sets_.find(interface_name);
- if (it != binding_sets_.end())
- it->second->OnRequestForFrame(render_frame_host, std::move(handle));
+ auto it = receiver_sets_.find(interface_name);
+ if (it != receiver_sets_.end())
+ it->second->OnReceiverForFrame(render_frame_host, std::move(handle));
}
void WebContentsImpl::OnInterfaceRequest(
@@ -7316,10 +7316,10 @@
dialog_manager_ = dialog_manager;
}
-void WebContentsImpl::RemoveBindingSet(const std::string& interface_name) {
- auto it = binding_sets_.find(interface_name);
- if (it != binding_sets_.end())
- binding_sets_.erase(it);
+void WebContentsImpl::RemoveReceiverSet(const std::string& interface_name) {
+ auto it = receiver_sets_.find(interface_name);
+ if (it != receiver_sets_.end())
+ receiver_sets_.erase(it);
}
bool WebContentsImpl::AddDomainInfoToRapporSample(rappor::Sample* sample) {
