Fix media code to use initializer-list style for inheritance.

Review URL: http://codereview.chromium.org/7400013

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@92826 0039d316-1c4b-4281-b951-d872f2087c98

21 files changed, 74 insertions, 58 deletions

diff --git a/content/browser/renderer_host/media/audio_input_renderer_host.h b/content/browser/renderer_host/media/audio_input_renderer_host.h
index b7d40b4..5fde275 100644
--- a/content/browser/renderer_host/media/audio_input_renderer_host.h
+++ b/content/browser/renderer_host/media/audio_input_renderer_host.h
@@ -35,8 +35,9 @@
 class AudioManager;
 struct AudioParameters;
 
-class AudioInputRendererHost : public BrowserMessageFilter,
-    public media::AudioInputController::EventHandler {
+class AudioInputRendererHost
+    : public BrowserMessageFilter,
+      public media::AudioInputController::EventHandler {
  public:
   struct AudioEntry {
     AudioEntry();
diff --git a/content/browser/renderer_host/media/audio_renderer_host.h b/content/browser/renderer_host/media/audio_renderer_host.h
index 8837d5a..52d0fca 100644
--- a/content/browser/renderer_host/media/audio_renderer_host.h
+++ b/content/browser/renderer_host/media/audio_renderer_host.h
@@ -73,8 +73,9 @@ namespace content {
 class ResourceContext;
 }  // namespace content
 
-class AudioRendererHost : public BrowserMessageFilter,
-                          public media::AudioOutputController::EventHandler {
+class AudioRendererHost
+    : public BrowserMessageFilter,
+      public media::AudioOutputController::EventHandler {
  public:
   struct AudioEntry {
     AudioEntry();
diff --git a/content/browser/renderer_host/media/media_stream_manager.h b/content/browser/renderer_host/media/media_stream_manager.h
index 108cafe..f5792ce 100644
--- a/content/browser/renderer_host/media/media_stream_manager.h
+++ b/content/browser/renderer_host/media/media_stream_manager.h
@@ -38,8 +38,9 @@ class VideoCaptureManager;
 // start the media flow.
 // The classes requesting new media streams are answered using
 // MediaStreamManager::Listener.
-class MediaStreamManager : public MediaStreamProviderListener,
-                           public SettingsRequester {
+class MediaStreamManager
+    : public MediaStreamProviderListener,
+      public SettingsRequester {
  public:
   typedef MediaStreamManager* (AccessorMethod)();
   static MediaStreamManager* Get();
diff --git a/content/browser/renderer_host/media/video_capture_host.h b/content/browser/renderer_host/media/video_capture_host.h
index 4abed9a..335ee4b 100644
--- a/content/browser/renderer_host/media/video_capture_host.h
+++ b/content/browser/renderer_host/media/video_capture_host.h
@@ -43,8 +43,9 @@
 #include "content/browser/renderer_host/media/video_capture_controller.h"
 #include "ipc/ipc_message.h"
 
-class VideoCaptureHost : public BrowserMessageFilter,
-                         public VideoCaptureControllerEventHandler {
+class VideoCaptureHost
+    : public BrowserMessageFilter,
+      public VideoCaptureControllerEventHandler {
  public:
   VideoCaptureHost();
 
diff --git a/content/renderer/media/audio_device.h b/content/renderer/media/audio_device.h
index b53f9bf..f36399c 100644
--- a/content/renderer/media/audio_device.h
+++ b/content/renderer/media/audio_device.h
@@ -57,9 +57,10 @@
 
 struct AudioParameters;
 
-class AudioDevice : public AudioMessageFilter::Delegate,
-                    public base::DelegateSimpleThread::Delegate,
-                    public base::RefCountedThreadSafe<AudioDevice> {
+class AudioDevice
+    : public AudioMessageFilter::Delegate,
+      public base::DelegateSimpleThread::Delegate,
+      public base::RefCountedThreadSafe<AudioDevice> {
  public:
   class RenderCallback {
    public:
diff --git a/content/renderer/media/audio_input_device.h b/content/renderer/media/audio_input_device.h
index 4099452..c4e0e17 100644
--- a/content/renderer/media/audio_input_device.h
+++ b/content/renderer/media/audio_input_device.h
@@ -59,9 +59,10 @@ struct AudioParameters;
 
 // TODO(henrika): This class is based on the AudioDevice class and it has
 // many components in common. Investigate potential for re-factoring.
-class AudioInputDevice : public AudioInputMessageFilter::Delegate,
-                         public base::DelegateSimpleThread::Delegate,
-                         public base::RefCountedThreadSafe<AudioInputDevice> {
+class AudioInputDevice
+    : public AudioInputMessageFilter::Delegate,
+      public base::DelegateSimpleThread::Delegate,
+      public base::RefCountedThreadSafe<AudioInputDevice> {
  public:
   class CaptureCallback {
    public:
diff --git a/content/renderer/media/audio_renderer_impl.h b/content/renderer/media/audio_renderer_impl.h
index 5ba9bc5..c234da0 100644
--- a/content/renderer/media/audio_renderer_impl.h
+++ b/content/renderer/media/audio_renderer_impl.h
@@ -52,10 +52,11 @@
 
 class AudioMessageFilter;
 
-class AudioRendererImpl : public media::AudioRendererBase,
-                          public AudioMessageFilter::Delegate,
-                          public base::DelegateSimpleThread::Delegate,
-                          public MessageLoop::DestructionObserver {
+class AudioRendererImpl
+    : public media::AudioRendererBase,
+      public AudioMessageFilter::Delegate,
+      public base::DelegateSimpleThread::Delegate,
+      public MessageLoop::DestructionObserver {
  public:
   // Methods called on Render thread ------------------------------------------
   explicit AudioRendererImpl();
diff --git a/media/audio/fake_audio_input_stream.h b/media/audio/fake_audio_input_stream.h
index 4ace4877..6c0eb73 100644
--- a/media/audio/fake_audio_input_stream.h
+++ b/media/audio/fake_audio_input_stream.h
@@ -16,9 +16,9 @@
 #include "media/audio/audio_io.h"
 #include "media/audio/audio_parameters.h"
 
-class FakeAudioInputStream :
-    public AudioInputStream,
-    public base::RefCountedThreadSafe<FakeAudioInputStream> {
+class FakeAudioInputStream
+    : public AudioInputStream,
+      public base::RefCountedThreadSafe<FakeAudioInputStream> {
  public:
   static AudioInputStream* MakeFakeStream(const AudioParameters& params);
 
diff --git a/media/audio/simple_sources.h b/media/audio/simple_sources.h
index 068b964..5ea1fee 100644
--- a/media/audio/simple_sources.h
+++ b/media/audio/simple_sources.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
 
@@ -56,8 +56,9 @@ class PushAudioOutput {
 // a pull model provider AudioSourceCallback. Fundamentally it manages a series
 // of audio buffers and is unaware of the actual audio format.
 // Note that the PushSource is not thread safe and user need to provide locking.
-class PushSource : public AudioOutputStream::AudioSourceCallback,
-                   public PushAudioOutput {
+class PushSource
+    : public AudioOutputStream::AudioSourceCallback,
+      public PushAudioOutput {
  public:
   PushSource();
   virtual ~PushSource();
diff --git a/media/base/mock_reader.h b/media/base/mock_reader.h
index 35b374e..c8a5e8c 100644
--- a/media/base/mock_reader.h
+++ b/media/base/mock_reader.h
@@ -17,8 +17,8 @@ namespace media {
 // Ref counted object so we can create callbacks for asynchronous Read()
 // methods for any filter type.
 template <class FilterType, class BufferType>
-class MockReader :
-    public base::RefCountedThreadSafe<MockReader<FilterType, BufferType> > {
+class MockReader
+    : public base::RefCountedThreadSafe<MockReader<FilterType, BufferType> > {
  public:
   MockReader()
       : called_(false),
diff --git a/media/filters/audio_renderer_impl.h b/media/filters/audio_renderer_impl.h
index b0ffc87..1e33822 100644
--- a/media/filters/audio_renderer_impl.h
+++ b/media/filters/audio_renderer_impl.h
@@ -24,8 +24,9 @@
 
 namespace media {
 
-class AudioRendererImpl : public AudioRendererBase,
-                          public AudioOutputStream::AudioSourceCallback {
+class AudioRendererImpl
+    : public AudioRendererBase,
+      public AudioOutputStream::AudioSourceCallback {
  public:
   AudioRendererImpl();
   virtual ~AudioRendererImpl();
diff --git a/media/filters/ffmpeg_demuxer.h b/media/filters/ffmpeg_demuxer.h
index 1558d47..e89cb22 100644
--- a/media/filters/ffmpeg_demuxer.h
+++ b/media/filters/ffmpeg_demuxer.h
@@ -128,8 +128,7 @@ class FFmpegDemuxerStream : public DemuxerStream {
   DISALLOW_COPY_AND_ASSIGN(FFmpegDemuxerStream);
 };
 
-class FFmpegDemuxer : public Demuxer,
-                      public FFmpegURLProtocol {
+class FFmpegDemuxer : public Demuxer, public FFmpegURLProtocol {
  public:
   explicit FFmpegDemuxer(MessageLoop* message_loop);
   virtual ~FFmpegDemuxer();
diff --git a/media/filters/ffmpeg_demuxer_factory.cc b/media/filters/ffmpeg_demuxer_factory.cc
index 481f6ee..24e58dc 100644
--- a/media/filters/ffmpeg_demuxer_factory.cc
+++ b/media/filters/ffmpeg_demuxer_factory.cc
@@ -43,8 +43,8 @@ class DemuxerCallbackAsPipelineStatusCallback : public PipelineStatusCallback {
 };
 
 // See comments on DemuxerCallbackAsPipelineStatusCallback above.
-class DemuxerCallbackAsDataSourceCallback :
-    public DataSourceFactory::BuildCallback {
+class DemuxerCallbackAsDataSourceCallback
+    : public DataSourceFactory::BuildCallback {
  public:
   DemuxerCallbackAsDataSourceCallback(DemuxerFactory::BuildCallback* cb,
                                       MessageLoop* loop)
diff --git a/media/filters/ffmpeg_video_decoder.h b/media/filters/ffmpeg_video_decoder.h
index 3281193..38a3bcc 100644
--- a/media/filters/ffmpeg_video_decoder.h
+++ b/media/filters/ffmpeg_video_decoder.h
@@ -19,8 +19,9 @@ namespace media {
 
 class VideoDecodeEngine;
 
-class FFmpegVideoDecoder : public VideoDecoder,
-                           public VideoDecodeEngine::EventHandler {
+class FFmpegVideoDecoder
+    : public VideoDecoder,
+      public VideoDecodeEngine::EventHandler {
  public:
   FFmpegVideoDecoder(MessageLoop* message_loop,
                      VideoDecodeContext* decode_context);
diff --git a/media/filters/null_audio_renderer.h b/media/filters/null_audio_renderer.h
index 28da99b..69f5848 100644
--- a/media/filters/null_audio_renderer.h
+++ b/media/filters/null_audio_renderer.h
@@ -27,8 +27,9 @@
 
 namespace media {
 
-class NullAudioRenderer : public AudioRendererBase,
-                          public base::PlatformThread::Delegate {
+class NullAudioRenderer
+    : public AudioRendererBase,
+      public base::PlatformThread::Delegate {
  public:
   NullAudioRenderer();
   virtual ~NullAudioRenderer();
diff --git a/media/filters/video_renderer_base.h b/media/filters/video_renderer_base.h
index 06bf7b3..2ea03ba 100644
--- a/media/filters/video_renderer_base.h
+++ b/media/filters/video_renderer_base.h
@@ -29,8 +29,9 @@ namespace media {
 
 // TODO(scherkus): to avoid subclasses, consider using a peer/delegate interface
 // and pass in a reference to the constructor.
-class VideoRendererBase : public VideoRenderer,
-                          public base::PlatformThread::Delegate {
+class VideoRendererBase
+    : public VideoRenderer,
+      public base::PlatformThread::Delegate {
  public:
   VideoRendererBase();
   virtual ~VideoRendererBase();
diff --git a/media/tools/player_wtl/mainfrm.h b/media/tools/player_wtl/mainfrm.h
index 6c73957..2705807 100644
--- a/media/tools/player_wtl/mainfrm.h
+++ b/media/tools/player_wtl/mainfrm.h
@@ -1,6 +1,6 @@
-// Copyright (c) 2009 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.
+// Copyright (c) 2011 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_TOOLS_PLAYER_WTL_MAINFRM_H_
 #define MEDIA_TOOLS_PLAYER_WTL_MAINFRM_H_
@@ -20,10 +20,12 @@ const wchar_t* const g_lpcstrApp = L"MediaPlayer";
 
 // Interface of the CMainFrame class
 // TODO(fbarchard): Remove hungarian notation.
-class CMainFrame : public CFrameWindowImpl<CMainFrame>,
-    public CUpdateUI<CMainFrame>,
-    public CMessageFilter, public CIdleHandler,
-    public CPrintJobInfo {
+class CMainFrame
+    : public CFrameWindowImpl<CMainFrame>,
+      public CUpdateUI<CMainFrame>,
+      public CMessageFilter,
+      public CIdleHandler,
+      public CPrintJobInfo {
  public:
   DECLARE_FRAME_WND_CLASS(NULL, IDR_MAINFRAME)
 
diff --git a/media/tools/player_wtl/seek.h b/media/tools/player_wtl/seek.h
index d5cf464..165e592 100644
--- a/media/tools/player_wtl/seek.h
+++ b/media/tools/player_wtl/seek.h
@@ -1,6 +1,6 @@
-// Copyright (c) 2009 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.
+// Copyright (c) 2011 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_TOOLS_PLAYER_WTL_SEEK_H_
 #define MEDIA_TOOLS_PLAYER_WTL_SEEK_H_
@@ -10,9 +10,10 @@
 // Movie seek dialog.
 // TODO(fbachard): Frame properties only work for images, so
 // this tab is removed until movie frame properties can be added.
-class CSeek : public CSimpleDialog<IDD_SEEK>,
-              public CMessageFilter,
-              public CIdleHandler {
+class CSeek
+    : public CSimpleDialog<IDD_SEEK>,
+      public CMessageFilter,
+      public CIdleHandler {
  public:
   CSeek() {
   }
diff --git a/media/video/ffmpeg_video_decode_engine_unittest.cc b/media/video/ffmpeg_video_decode_engine_unittest.cc
index ae3ee12..2527d4f 100644
--- a/media/video/ffmpeg_video_decode_engine_unittest.cc
+++ b/media/video/ffmpeg_video_decode_engine_unittest.cc
@@ -48,8 +48,9 @@ ACTION_P(SaveInitializeResult, engine) {
   engine->set_video_codec_info(arg0);
 }
 
-class FFmpegVideoDecodeEngineTest : public testing::Test,
-                                    public VideoDecodeEngine::EventHandler {
+class FFmpegVideoDecodeEngineTest
+    : public testing::Test,
+      public VideoDecodeEngine::EventHandler {
  public:
   FFmpegVideoDecodeEngineTest()
       : config_(kCodecH264, kWidth, kHeight, kSurfaceWidth, kSurfaceHeight,
diff --git a/webkit/glue/media/buffered_resource_loader.h b/webkit/glue/media/buffered_resource_loader.h
index 43a17d6..bdbb6a8 100644
--- a/webkit/glue/media/buffered_resource_loader.h
+++ b/webkit/glue/media/buffered_resource_loader.h
@@ -32,9 +32,9 @@ const char kDataScheme[] = "data";
 // WebURLLoader and does the actual resource loading. This object does
 // buffering internally, it defers the resource loading if buffer is full
 // and un-defers the resource loading if it is under buffered.
-class BufferedResourceLoader :
-    public base::RefCountedThreadSafe<BufferedResourceLoader>,
-    public WebKit::WebURLLoaderClient {
+class BufferedResourceLoader
+    : public base::RefCountedThreadSafe<BufferedResourceLoader>,
+      public WebKit::WebURLLoaderClient {
  public:
   // kNeverDefer - Aggresively buffer; never defer loading while paused.
   // kReadThenDefer - Request only enough data to fulfill read requests.
diff --git a/webkit/glue/media/simple_data_source.h b/webkit/glue/media/simple_data_source.h
index 2c4075af..98934d3 100644
--- a/webkit/glue/media/simple_data_source.h
+++ b/webkit/glue/media/simple_data_source.h
@@ -29,8 +29,9 @@ class WebMediaPlayerDelegateImpl;
 
 namespace webkit_glue {
 
-class SimpleDataSource : public WebDataSource,
-                         public WebKit::WebURLLoaderClient {
+class SimpleDataSource
+    : public WebDataSource,
+      public WebKit::WebURLLoaderClient {
  public:
   // Creates a DataSourceFactory for building SimpleDataSource objects.
   static media::DataSourceFactory* CreateFactory(