media: Add |bad_message_cb_| to MojoRendererService

media/mojo/services/mojo_renderer_service.h

 // Copyright 2014 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.
 
 #ifndef MEDIA_MOJO_SERVICES_MOJO_RENDERER_SERVICE_H_
 #define MEDIA_MOJO_SERVICES_MOJO_RENDERER_SERVICE_H_
 
 #include <stdint.h>
 #include <memory>
 
@@ skipping 67 matching lines @@
     STATE_ERROR
   };
 
   MojoRendererService(
       base::WeakPtr<MojoCdmServiceContext> mojo_cdm_service_context,
       scoped_refptr<AudioRendererSink> audio_sink,
       std::unique_ptr<VideoRendererSink> video_sink,
       std::unique_ptr<media::Renderer> renderer,
       InitiateSurfaceRequestCB initiate_surface_request_cb);
 
+  void set_bad_message_cb(base::Closure bad_message_cb) {
+    bad_message_cb_ = bad_message_cb;
+  }
+
   // RendererClient implementation.
   void OnError(PipelineStatus status) final;
   void OnEnded() final;
   void OnStatisticsUpdate(const PipelineStatistics& stats) final;
   void OnBufferingStateChange(BufferingState state) final;
   void OnWaitingForDecryptionKey() final;
   void OnVideoNaturalSizeChange(const gfx::Size& size) final;
   void OnVideoOpacityChange(bool opaque) final;
   void OnDurationChange(base::TimeDelta duration) final;
 
@@ skipping 45 matching lines @@
   // Note: Destroy |renderer_| first to avoid access violation into other
   // members, e.g. |stream_provider_|, |cdm_|, |audio_sink_|, and
   // |video_sink_|.
   // Must use "media::" because "Renderer" is ambiguous.
   std::unique_ptr<media::Renderer> renderer_;
 
   // Registers a new request in the ScopedSurfaceRequestManager.
   // Returns the token to be used to fulfill the request.
   InitiateSurfaceRequestCB initiate_surface_request_cb_;
 
-  // WeakPtr to the binding that owns |this|.
-  // Used to forcefully close the connection (which also safely destroy |this|).
-  mojo::StrongBindingPtr<mojom::Renderer> binding_;
+  // Callback to be called when an invalid or unexpected message is received.
+  // TODO(tguilbert): Revisit how to do InitiateScopedSurfaceRequest() so that
+  // we can eliminate this callback. See http://crbug.com/669606
+  base::Closure bad_message_cb_;
 
   base::WeakPtr<MojoRendererService> weak_this_;
   base::WeakPtrFactory<MojoRendererService> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(MojoRendererService);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_MOJO_SERVICES_MOJO_RENDERER_SERVICE_H_