[Presentation API] (5th) (1-UA) integrate controller and receiver side for 1-UA messaging

content/browser/presentation/presentation_service_impl.cc

Index: content/browser/presentation/presentation_service_impl.cc
diff --git a/content/browser/presentation/presentation_service_impl.cc b/content/browser/presentation/presentation_service_impl.cc
index 2b6aca7350cc3b80086b5291a42aa74b9db56d20..9cb67bf838ae3ae8f04e4306d3eada4d98ac0c74 100644
--- a/content/browser/presentation/presentation_service_impl.cc
+++ b/content/browser/presentation/presentation_service_impl.cc
@@ -389,7 +389,7 @@ void PresentationServiceImpl::SendConnectionMessage(
     blink::mojom::ConnectionMessagePtr connection_message,
     const SendConnectionMessageCallback& callback) {
   DVLOG(2) << "SendConnectionMessage"
-           << " [id]: " << session->id;
+           << " [presentation id]: " << session->id;
   DCHECK(!connection_message.is_null());
   // send_message_callback_ should be null by now, otherwise resetting of
   // send_message_callback_ with new callback will drop the old callback.
@@ -491,7 +491,7 @@ void PresentationServiceImpl::SetPresentationConnection(
     return;
 
   PresentationSessionInfo session_info(session.To<PresentationSessionInfo>());
-  controller_delegate_->ConnectToOffscreenPresentation(
+  controller_delegate_->ConnectToPresentation(
       render_process_id_, render_frame_id_, session_info,
       std::move(controller_connection_ptr),
       std::move(receiver_connection_request));
@@ -504,7 +504,7 @@ void PresentationServiceImpl::OnConnectionMessages(
   DCHECK(client_);
 
   DVLOG(2) << "OnConnectionMessages"
-           << " [id]: " << session.presentation_id;
+           << " [presentation_id]: " << session.presentation_id;
   std::vector<blink::mojom::ConnectionMessagePtr> mojo_messages(
       messages.size());
   std::transform(