Revert 189210 "Add MODIFY_AUDIO_SETTINGS permission in Android m..."

media/audio/android/opensles_output.h

 // 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.
 
 #ifndef MEDIA_AUDIO_ANDROID_OPENSLES_OUTPUT_H_
 #define MEDIA_AUDIO_ANDROID_OPENSLES_OUTPUT_H_
 
-#include <SLES/OpenSLES.h>
-#include <SLES/OpenSLES_Android.h>
-#include <SLES/OpenSLES_AndroidConfiguration.h>
+#include <vector>
 
 #include "base/compiler_specific.h"
 #include "media/audio/android/opensles_util.h"
 #include "media/audio/audio_io.h"
 #include "media/audio/audio_parameters.h"
+#include <SLES/OpenSLES_Android.h>
 
 namespace media {
 
 class AudioManagerAndroid;
 
 // Implements PCM audio output support for Android using the OpenSLES API.
 class OpenSLESOutputStream : public AudioOutputStream {
  public:
   static const int kNumOfQueuesInBuffer = 2;
 
@@ skipping 57 matching lines @@
 
   // Container for retrieving data from AudioSourceCallback::OnMoreData().
   scoped_ptr<AudioBus> audio_bus_;
 
   DISALLOW_COPY_AND_ASSIGN(OpenSLESOutputStream);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_AUDIO_ANDROID_OPENSLES_INPUT_H_