[MediaRouter] Renames CloseRoute() to Terminate() and creates DetachRoute()

content/browser/presentation/presentation_service_impl.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/presentation/presentation_service_impl.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 395 matching lines @@
 
 void PresentationServiceImpl::OnSendMessageCallback(bool sent) {
   // It is possible that Reset() is invoked before receiving this callback.
   // So, always check send_message_callback_ for non-null.
   if (send_message_callback_) {
     send_message_callback_->Run(sent);
     send_message_callback_.reset();
   }
 }
 
-void PresentationServiceImpl::CloseSession(
+void PresentationServiceImpl::CloseConnection(
     const mojo::String& presentation_url,
     const mojo::String& presentation_id) {
-  DVLOG(2) << "CloseSession " << presentation_id;
+  DVLOG(2) << "CloseConnection " << presentation_id;
   if (delegate_)
-    delegate_->CloseSession(render_process_id_, render_frame_id_,
-                            presentation_id);
+    delegate_->CloseConnection(render_process_id_, render_frame_id_,
+                               presentation_id);
 }
 
-void PresentationServiceImpl::TerminateSession(
-    const mojo::String& presentation_url,
-    const mojo::String& presentation_id) {
-  DVLOG(2) << "TerminateSession " << presentation_id;
+void PresentationServiceImpl::Terminate(const mojo::String& presentation_url,
+                                        const mojo::String& presentation_id) {
+  DVLOG(2) << "Terminate " << presentation_id;
   if (delegate_)
-    delegate_->TerminateSession(render_process_id_, render_frame_id_,
-                                presentation_id);
+    delegate_->Terminate(render_process_id_, render_frame_id_, presentation_id);
 }
 
 void PresentationServiceImpl::OnConnectionStateChanged(
     const PresentationSessionInfo& connection,
     PresentationConnectionState state) {
   DCHECK(client_.get());
   client_->OnConnectionStateChanged(
       presentation::PresentationSessionInfo::From(connection),
       PresentationConnectionStateToMojo(state));
 }
@@ skipping 155 matching lines @@
 
 void PresentationServiceImpl::NewSessionMojoCallbackWrapper::Run(
     presentation::PresentationSessionInfoPtr session,
     presentation::PresentationErrorPtr error) {
   DCHECK(!callback_.is_null());
   callback_.Run(session.Pass(), error.Pass());
   callback_.reset();
 }
 
 }  // namespace content