DialogSurfaceHolder implementation.

media/base/android/dialog_surface_manager.cc

 // Copyright 2016 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 "media/base/android/dialog_surface_manager.h"
 
 #include <algorithm>
 #include <limits>
 #include <memory>
 #include <utility>
 
 #include "base/android/build_info.h"
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "base/logging.h"
 #include "base/numerics/safe_conversions.h"
 #include "base/strings/string_util.h"
 #include "gpu/ipc/common/android/dialog_surface_lookup.h"
 #include "jni/DialogSurfaceManagerWrapper_jni.h"
+#include "media/base/android/dialog_surface_callback.h"
 #include "media/base/bit_reader.h"
 #include "media/base/decrypt_config.h"
 
 using base::android::AttachCurrentThread;
 using base::android::ConvertJavaStringToUTF8;
 using base::android::ConvertUTF8ToJavaString;
 using base::android::JavaIntArrayToIntVector;
 using base::android::ScopedJavaGlobalRef;
 using base::android::ScopedJavaLocalRef;
 
@@ skipping 24 matching lines @@
 DialogSurfaceManager::~DialogSurfaceManager() {}
 
 std::unique_ptr<DialogSurfaceHolder> DialogSurfaceManager::CreateSurface(
     base::ProcessHandle pid,
     int frame_id,
     const Config& config,
     const DialogSurfaceHolder::Callback& callback) {
   JNIEnv* env = AttachCurrentThread();
   CHECK(env);
 
-  // TODO(liberato): wrap the callback here, and send in place of the nullptr.
-  // This was omitted for the first CL.
+  std::unique_ptr<DialogSurfaceCallback> wrapped_callback(
+      new DialogSurfaceCallback(callback));
 
   ScopedJavaGlobalRef<jobject> result(
       Java_DialogSurfaceManagerWrapper_createSurface(
-          env, j_wrapped_manager_.obj(), pid, frame_id, nullptr,
+          env, j_wrapped_manager_.obj(), pid, frame_id, wrapped_callback->obj(),
           config.rect.x(), config.rect.y(), config.rect.width(),
           config.rect.height()));
-  // NOTE: result is always null right now.
 
   std::unique_ptr<DialogSurfaceHolder> holder;
+  if (result.obj() != nullptr) {
+    holder.reset(new DialogSurfaceHolder(result, std::move(wrapped_callback)));
+  }
 
   return holder;
 }
 
 }  // namespace media