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

chrome/browser/media/android/router/media_router_android.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 "chrome/browser/media/android/router/media_router_android.h"
 
 #include "base/android/context_utils.h"
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
@@ skipping 132 matching lines @@
   Java_ChromeMediaRouter_joinRoute(
       env,
       java_media_router_.obj(),
       jsource_id.obj(),
       jpresentation_id.obj(),
       jorigin.obj(),
       tab_id,
       request_id);
 }
 
-void MediaRouterAndroid::CloseRoute(const MediaRoute::Id& route_id) {
+void MediaRouterAndroid::DetachRoute(const MediaRoute::Id& route_id) {
   JNIEnv* env = base::android::AttachCurrentThread();
   ScopedJavaLocalRef<jstring> jroute_id =
           base::android::ConvertUTF8ToJavaString(env, route_id);
   Java_ChromeMediaRouter_closeRoute(
       env, java_media_router_.obj(), jroute_id.obj());
 }
 
+void MediaRouterAndroid::TerminateRoute(const MediaRoute::Id& route_id) {
+  NOTIMPLEMENTED();

[mlamouri (slow - plz ping), 2015/12/10 15:39:51]

Could you add a TODO for avayvod@ and mlamouri@ linked to bug 540803?

[mark a. foltz, 2015/12/10 23:46:48]

Done.

I think I got the semantics switched here. CloseRoute actually should become
Terminate and DetachRoute is NOT_IMPLEMENTED based on my reading of the Java
code.

Let me know if I'm still wrong.

[imcheng, 2015/12/11 00:15:16]

I thought it already has detachRoute. The logic in OnPresentationSessionDetached
should be moved to DetachRoute, and then OnPresentationSessionDetached should be
removed from here and .h file.

+}
+
 void MediaRouterAndroid::SendRouteMessage(
     const MediaRoute::Id& route_id,
     const std::string& message,
     const SendRouteMessageCallback& callback) {
   int callback_id = message_callbacks_.Add(
       new SendRouteMessageCallback(callback));
   JNIEnv* env = base::android::AttachCurrentThread();
   ScopedJavaLocalRef<jstring> jroute_id =
           base::android::ConvertUTF8ToJavaString(env, route_id);
   ScopedJavaLocalRef<jstring> jmessage =
@@ skipping 247 matching lines @@
   scoped_ptr<content::PresentationSessionMessage> message(
       new content::PresentationSessionMessage(content::TEXT));
   message->message = ConvertJavaStringToUTF8(env, jmessage);
   session_messages.push_back(message.Pass());
 
   FOR_EACH_OBSERVER(PresentationSessionMessagesObserver, *observer_list,
                     OnMessagesReceived(session_messages, true));
 }
 
 }  // namespace media_router