Revert 152406 - Introduce shared_memory_support media target for PPAPI.

media/audio/audio_output_device.cc

 // Copyright (c) 2012 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.
 
 #include "media/audio/audio_output_device.h"
 
 #include "base/debug/trace_event.h"
 #include "base/message_loop.h"
 #include "base/threading/thread_restrictions.h"
 #include "base/time.h"
 #include "media/audio/audio_output_controller.h"
 #include "media/audio/audio_util.h"
-#include "media/audio/shared_memory_util.h"
 
 namespace media {
 
 // Takes care of invoking the render callback on the audio thread.
 // An instance of this class is created for each capture stream in
 // OnStreamCreated().
 class AudioOutputDevice::AudioThreadCallback
     : public AudioDeviceThread::Callback {
  public:
   AudioThreadCallback(const AudioParameters& audio_parameters,
@@ skipping 223 matching lines @@
 
 AudioOutputDevice::AudioThreadCallback::~AudioThreadCallback() {
 }
 
 void AudioOutputDevice::AudioThreadCallback::MapSharedMemory() {
   shared_memory_.Map(TotalSharedMemorySizeInBytes(memory_length_));
 }
 
 // Called whenever we receive notifications about pending data.
 void AudioOutputDevice::AudioThreadCallback::Process(int pending_data) {
-  if (pending_data == kPauseMark) {
+  if (pending_data == AudioOutputController::kPauseMark) {
     memset(shared_memory_.memory(), 0, memory_length_);
     SetActualDataSizeInBytes(&shared_memory_, memory_length_, 0);
     return;
   }
 
   // Convert the number of pending bytes in the render buffer
   // into milliseconds.
   int audio_delay_milliseconds = pending_data / bytes_per_ms_;
 
   TRACE_EVENT0("audio", "AudioOutputDevice::FireRenderCallback");
 
   // Update the audio-delay measurement then ask client to render audio.
   size_t num_frames = render_callback_->Render(
       audio_bus_.get(), audio_delay_milliseconds);
 
   // Interleave, scale, and clip to int.
   // TODO(dalecurtis): Remove this when we have float everywhere.
   InterleaveFloatToInt(
       audio_bus_.get(), shared_memory_.memory(), num_frames,
       audio_parameters_.bits_per_sample() / 8);
 
   // Let the host know we are done.
   SetActualDataSizeInBytes(
       &shared_memory_, memory_length_,
       num_frames * audio_parameters_.GetBytesPerFrame());
 }
 
 }  // namespace media.