Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1007)

Unified Diff: content/browser/renderer_host/media/audio_input_device_manager_unittest.cc

Issue 13288002: Revert 190475 "Merge 189983 "Add speaker on/off control on Andro..." (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1410/src/
Patch Set: Created 7 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | content/test/webrtc_audio_device_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/renderer_host/media/audio_input_device_manager_unittest.cc
===================================================================
--- content/browser/renderer_host/media/audio_input_device_manager_unittest.cc (revision 191282)
+++ content/browser/renderer_host/media/audio_input_device_manager_unittest.cc (working copy)
@@ -16,11 +16,6 @@
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
-#if defined(OS_ANDROID)
-#include "base/android/jni_android.h"
-#include "media/audio/audio_manager_base.h"
-#endif
-
using testing::_;
using testing::InSequence;
using testing::SaveArg;
@@ -92,11 +87,6 @@
io_thread_.reset(new BrowserThreadImpl(BrowserThread::IO,
message_loop_.get()));
-#if defined(OS_ANDROID)
- media::AudioManagerBase::RegisterAudioManager(
- base::android::AttachCurrentThread());
-#endif
-
audio_manager_.reset(media::AudioManager::Create());
manager_ = new AudioInputDeviceManager(audio_manager_.get());
audio_input_listener_.reset(new MockAudioInputDeviceManagerListener());
« no previous file with comments | « no previous file | content/test/webrtc_audio_device_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698