[NotForReview] Move GJDAH and GJDA to media/gpu/mojo

media/gpu/mojo/service/gpu_jpeg_decode_accelerator.h

Index: media/gpu/mojo/service/gpu_jpeg_decode_accelerator.h
diff --git a/media/gpu/ipc/service/gpu_jpeg_decode_accelerator.h b/media/gpu/mojo/service/gpu_jpeg_decode_accelerator.h
similarity index 58%
rename from media/gpu/ipc/service/gpu_jpeg_decode_accelerator.h
rename to media/gpu/mojo/service/gpu_jpeg_decode_accelerator.h
index 811ad6ec6ad12a51bf118ad72334d10c84767a82..2a6fa0f85bea993e4ee60e5413e2789ca94a7399 100644
--- a/media/gpu/ipc/service/gpu_jpeg_decode_accelerator.h
+++ b/media/gpu/mojo/service/gpu_jpeg_decode_accelerator.h
@@ -11,20 +11,16 @@
 
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
-#include "base/memory/weak_ptr.h"
 #include "base/sequence_checker.h"
-#include "base/synchronization/waitable_event.h"
-#include "ipc/ipc_listener.h"
-#include "ipc/ipc_sender.h"
-#include "media/gpu/mojo/jpeg_decoder.mojom.h"
+#include "media/gpu/mojo/common/jpeg_decoder.mojom.h"
 #include "media/video/jpeg_decode_accelerator.h"
 
 namespace base {
 class SingleThreadTaskRunner;
 }
 
-namespace gpu {
-class FilteredSender;
+namespace service_manager {
+struct BindSourceInfo;
 }
 
 namespace media {
@@ -42,34 +38,26 @@ class GpuJpegDecodeAcceleratorFactoryProvider {
   static std::vector<CreateAcceleratorCB> GetAcceleratorFactories();
 };
 
-// TODO(c.padhi): Move GpuJpegDecodeAccelerator to media/gpu/mojo, see
-// http://crbug.com/699255.
-class GpuJpegDecodeAccelerator
-    : public IPC::Sender,
-      public mojom::GpuJpegDecodeAccelerator,
-      public base::SupportsWeakPtr<GpuJpegDecodeAccelerator> {
+class GpuJpegDecodeAccelerator : public mojom::GpuJpegDecodeAccelerator,
+                                 public JpegDecodeAccelerator::Client {
  public:
-  // |channel| must outlive this object.
-  // This convenience constructor internally calls
-  // GpuJpegDecodeAcceleratorFactoryProvider::GetAcceleratorFactories() to
-  // fill |accelerator_factory_functions_|.
-  GpuJpegDecodeAccelerator(
-      gpu::FilteredSender* channel,
-      scoped_refptr<base::SingleThreadTaskRunner> io_task_runner);
+  static void Create(scoped_refptr<base::SingleThreadTaskRunner> io_task_runner,
+                     const service_manager::BindSourceInfo& source_info,
+                     mojom::GpuJpegDecodeAcceleratorRequest request);
 
-  // |channel| must outlive this object.
-  GpuJpegDecodeAccelerator(
-      gpu::FilteredSender* channel,
-      scoped_refptr<base::SingleThreadTaskRunner> io_task_runner,
-      std::vector<GpuJpegDecodeAcceleratorFactoryProvider::CreateAcceleratorCB>
-          accelerator_factory_functions);
   ~GpuJpegDecodeAccelerator() override;
 
-  void AddClient(int32_t route_id, base::Callback<void(bool)> response);
+  // JpegDecodeAccelerator::Client implementation.
+  void VideoFrameReady(int32_t buffer_id) override;
+  void NotifyError(int32_t buffer_id,
+                   JpegDecodeAccelerator::Error error) override;
 
-  void NotifyDecodeStatus(int32_t route_id,
-                          int32_t bitstream_buffer_id,
-                          JpegDecodeAccelerator::Error error);
+ private:
+  // This constructor internally calls
+  // GpuJpegDecodeAcceleratorFactoryProvider::GetAcceleratorFactories() to
+  // fill |accelerator_factory_functions_|.
+  GpuJpegDecodeAccelerator(
+      scoped_refptr<base::SingleThreadTaskRunner> io_task_runner);
 
   // mojom::GpuJpegDecodeAccelerator implementation.
   void Initialize(InitializeCallback callback) override;
@@ -80,31 +68,24 @@ class GpuJpegDecodeAccelerator
               DecodeCallback callback) override;
   void Uninitialize() override;
 
-  // Function to delegate sending to actual sender.
-  bool Send(IPC::Message* message) override;
-
- private:
-  class Client;
-  class MessageFilter;
-
-  void ClientRemoved();
+  void DecodeOnIOThread(mojom::BitstreamBufferPtr input_buffer,
+                        const gfx::Size& coded_size,
+                        mojo::ScopedSharedBufferHandle output_handle,
+                        uint32_t output_buffer_size);
+  void NotifyDecodeStatus(int32_t bitstream_buffer_id, mojom::Error error);
 
   std::vector<GpuJpegDecodeAcceleratorFactoryProvider::CreateAcceleratorCB>
       accelerator_factory_functions_;
 
-  gpu::FilteredSender* channel_;
-
-  // The message filter to run JpegDecodeAccelerator::Decode on IO thread.
-  scoped_refptr<MessageFilter> filter_;
-
   // GPU child task runner.
   scoped_refptr<base::SingleThreadTaskRunner> child_task_runner_;
 
   // GPU IO task runner.
   scoped_refptr<base::SingleThreadTaskRunner> io_task_runner_;
 
-  // Number of clients added to |filter_|.
-  int client_number_;
+  DecodeCallback decode_cb_;
+
+  std::unique_ptr<JpegDecodeAccelerator> accelerator_;
 
   SEQUENCE_CHECKER(sequence_checker_);