Merge service_manager::BinderMapWithContext into mojo::BinderMap

Tbr: [email protected]
Bug: 1046578
Change-Id: Ic2c01ee09c4b6a9fb2a936acf28fc0f00dc053f1
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2174654
Commit-Queue: Robert Sesek <[email protected]>
Reviewed-by: Oksana Zhuravlova <[email protected]>
Cr-Commit-Position: refs/heads/master@{#765090}
diff --git a/docs/mojo_and_services.md b/docs/mojo_and_services.md
index 8ff938d..2aff980 100644
--- a/docs/mojo_and_services.md
+++ b/docs/mojo_and_services.md
@@ -218,7 +218,7 @@
 
 // browser_interface_binders.cc
 void PopulateFrameBinders(RenderFrameHostImpl* host,
-                          service_manager::BinderMap* map) {
+                          mojo::BinderMap* map) {
 ...
   // Register the handler for PingResponder.
   map->Add<example::mojom::PingResponder>(base::BindRepeating(
@@ -447,7 +447,7 @@
 ``` cpp
 // //content/browser/browser_interface_binders.cc
 void PopulateFrameBinders(RenderFrameHostImpl* host,
-                          service_manager::BinderMap* map) {
+                          mojo::BinderMap* map) {
 ...
   map->Add<magic::mojom::GoatTeleporter>(base::BindRepeating(
       &RenderFrameHostImpl::GetGoatTeleporter, base::Unretained(host)));