Hook up RendererMediaSessionManager with browser side

content/renderer/media/android/webmediasession_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 "content/renderer/media/android/webmediasession_android.h"
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "content/renderer/media/android/renderer_media_session_manager.h"
 
 namespace content {
 
 WebMediaSessionAndroid::WebMediaSessionAndroid(
     RendererMediaSessionManager* session_manager)
-    : session_manager_(session_manager) {
+    : session_manager_(session_manager), next_request_id_(0) {
   DCHECK(session_manager_);
   session_id_ = session_manager_->RegisterMediaSession(this);
 }
 
 WebMediaSessionAndroid::~WebMediaSessionAndroid() {
   session_manager_->UnregisterMediaSession(session_id_);
 }
 
 void WebMediaSessionAndroid::activate(
-    blink::WebMediaSessionActivateCallback* raw_callback) {
-  NOTIMPLEMENTED();
-
-  scoped_ptr<blink::WebMediaSessionActivateCallback> callback(raw_callback);
-  callback->onError(blink::WebMediaSessionError::Activate);
+    blink::WebMediaSessionActivateCallback* callback) {
+  int request_id = activation_requests_.Add(callback);
+  session_manager_->Activate(session_id_, request_id);
 }
 
 void WebMediaSessionAndroid::deactivate(
-    blink::WebMediaSessionDeactivateCallback* raw_callback) {
-  NOTIMPLEMENTED();
+    blink::WebMediaSessionDeactivateCallback* callback) {
+  int request_id = deactivation_requests_.Add(callback);
+  session_manager_->Deactivate(session_id_, request_id);
+}
 
-  scoped_ptr<blink::WebMediaSessionDeactivateCallback> callback(raw_callback);
+void WebMediaSessionAndroid::OnDidActivate(int request_id, bool success) {
+  blink::WebMediaSessionActivateCallback* callback =
+      activation_requests_.Lookup(request_id);
+  if (!callback)

[philipj_slow, 2015/12/04 14:01:04]

Will this be possible if the GC problem is fixed? If not, NOTREACHED() before
return here? Unless IPC is special and having dead code (return after
NOTREACHED()) is verboten. Dito below.

[davve, 2015/12/04 14:52:55]

Same as other issue. As long as we have unittests for IPC communication we
expect to never happen, we can't have assert-type of checks here (AFAIK).

+    return;
+
+  if (success)
+    callback->onSuccess();
+  else
+    callback->onError(
+        blink::WebMediaSessionError(blink::WebMediaSessionError::Activate));
+  activation_requests_.Remove(request_id);
+}
+
+void WebMediaSessionAndroid::OnDidDeactivate(int request_id) {
+  blink::WebMediaSessionDeactivateCallback* callback =
+      deactivation_requests_.Lookup(request_id);
+  if (!callback)
+    return;
+
   callback->onSuccess();
+  deactivation_requests_.Remove(request_id);
 }
 
 }  // namespace content