OpenBSD patches for media, split from CR #8275005

Sync the dummy OpenBSD audio manager and exclude -mssse3 from
cflags on OpenBSD since it's not supported in the used gcc version.

BUG=
TEST=


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

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

2 files changed, 3 insertions, 15 deletions

diff --git a/media/audio/openbsd/audio_manager_openbsd.cc b/media/audio/openbsd/audio_manager_openbsd.cc
index cb94324..cb18768 100644
--- a/media/audio/openbsd/audio_manager_openbsd.cc
+++ b/media/audio/openbsd/audio_manager_openbsd.cc
@@ -4,10 +4,6 @@
 
 #include "media/audio/openbsd/audio_manager_openbsd.h"
 
-#include "base/logging.h"
-
-static AudioManagerOpenBSD* g_audio_manager = NULL;
-
 // Implementation of AudioManager.
 bool AudioManagerOpenBSD::HasAudioOutputDevices() {
   NOTIMPLEMENTED();
@@ -37,10 +33,6 @@ AudioManagerOpenBSD::AudioManagerOpenBSD() {
 AudioManagerOpenBSD::~AudioManagerOpenBSD() {
 }
 
-void AudioManagerOpenBSD::Init() {
-  AudioManagerBase::Init();
-}
-
 void AudioManagerOpenBSD::MuteAll() {
   NOTIMPLEMENTED();
 }
diff --git a/media/audio/openbsd/audio_manager_openbsd.h b/media/audio/openbsd/audio_manager_openbsd.h
index 8f7c412..b9f19c6 100644
--- a/media/audio/openbsd/audio_manager_openbsd.h
+++ b/media/audio/openbsd/audio_manager_openbsd.h
@@ -5,16 +5,13 @@
 #ifndef MEDIA_AUDIO_OPENBSD_AUDIO_MANAGER_OPENBSD_H_
 #define MEDIA_AUDIO_OPENBSD_AUDIO_MANAGER_OPENBSD_H_
 
-#include "base/compiler_specific.h"
-#include "media/audio/audio_io.h"
+#include "base/basictypes.h"
+#include "media/audio/audio_manager_base.h"
 
 class AudioManagerOpenBSD : public AudioManagerBase {
  public:
   AudioManagerOpenBSD();
 
-  // Call before using a newly created AudioManagerOpenBSD instance.
-  virtual void Init();
-
   // Implementation of AudioManager.
   virtual bool HasAudioOutputDevices() OVERRIDE;
   virtual bool HasAudioInputDevices() OVERRIDE;
@@ -26,10 +23,9 @@ class AudioManagerOpenBSD : public AudioManagerBase {
   virtual void MuteAll() OVERRIDE;
   virtual void UnMuteAll() OVERRIDE;
 
- protected:
+ private:
   virtual ~AudioManagerOpenBSD();
 
- private:
   DISALLOW_COPY_AND_ASSIGN(AudioManagerOpenBSD);
 };