[Chromecast] Upgrade to new CMA backend API

chromecast/renderer/media/demuxer_stream_adapter.h

Index: chromecast/renderer/media/demuxer_stream_adapter.h
diff --git a/chromecast/media/cma/filters/demuxer_stream_adapter.h b/chromecast/renderer/media/demuxer_stream_adapter.h
similarity index 90%
rename from chromecast/media/cma/filters/demuxer_stream_adapter.h
rename to chromecast/renderer/media/demuxer_stream_adapter.h
index 5e8d817b76c85a46b0c56f259f3ea0b37fd4a04d..7fbc7cdf3e44cb53d382cb0cca00e82cf8cd6844 100644
--- a/chromecast/media/cma/filters/demuxer_stream_adapter.h
+++ b/chromecast/renderer/media/demuxer_stream_adapter.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROMECAST_MEDIA_CMA_FILTERS_DEMUXER_STREAM_ADAPTER_H_
-#define CHROMECAST_MEDIA_CMA_FILTERS_DEMUXER_STREAM_ADAPTER_H_
+#ifndef CHROMECAST_RENDERER_MEDIA_DEMUXER_STREAM_ADAPTER_H_
+#define CHROMECAST_RENDERER_MEDIA_DEMUXER_STREAM_ADAPTER_H_
 
 #include "base/callback.h"
 #include "base/memory/scoped_ptr.h"
@@ -34,7 +34,7 @@ class DemuxerStreamAdapter : public CodedFrameProvider {
   DemuxerStreamAdapter(
       const scoped_refptr<base::SingleThreadTaskRunner>& task_runner,
       const scoped_refptr<BalancedMediaTaskRunnerFactory>&
-      media_task_runner_factory,
+          media_task_runner_factory,
       ::media::DemuxerStream* demuxer_stream);
   ~DemuxerStreamAdapter() override;
 
@@ -51,7 +51,7 @@ class DemuxerStreamAdapter : public CodedFrameProvider {
   // Callback invoked from the demuxer stream to signal a buffer is ready.
   void OnNewBuffer(const ReadCB& read_cb,
                    ::media::DemuxerStream::Status status,
-                   const scoped_refptr< ::media::DecoderBuffer>& input);
+                   const scoped_refptr<::media::DecoderBuffer>& input);
 
   base::ThreadChecker thread_checker_;
 
@@ -90,4 +90,4 @@ class DemuxerStreamAdapter : public CodedFrameProvider {
 }  // namespace media
 }  // namespace chromecast
 
-#endif  // CHROMECAST_MEDIA_CMA_FILTERS_DEMUXER_STREAM_ADAPTER_H_
+#endif  // CHROMECAST_RENDERER_MEDIA_DEMUXER_STREAM_ADAPTER_H_