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

Unified Diff: remoting/host/chromoting_host_unittest.cc

Issue 11260053: Use correct thread for audio capturing and encoding. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 2 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
Index: remoting/host/chromoting_host_unittest.cc
diff --git a/remoting/host/chromoting_host_unittest.cc b/remoting/host/chromoting_host_unittest.cc
index 361649132059e6342e6445104c4c43a95fdc8349..2ca3749c59601736fc2f211468d96c50d2af9f22 100644
--- a/remoting/host/chromoting_host_unittest.cc
+++ b/remoting/host/chromoting_host_unittest.cc
@@ -7,7 +7,6 @@
#include "base/message_loop_proxy.h"
#include "remoting/base/auto_thread_task_runner.h"
#include "remoting/jingle_glue/mock_objects.h"
-#include "remoting/host/audio_capturer.h"
#include "remoting/host/chromoting_host_context.h"
#include "remoting/host/chromoting_host.h"
#include "remoting/host/desktop_environment.h"
@@ -145,6 +144,7 @@ class ChromotingHostTest : public testing::Test {
&signal_strategy_,
desktop_environment_factory_.get(),
scoped_ptr<protocol::SessionManager>(session_manager_),
+ context_.audio_task_runner(),
context_.capture_task_runner(),
context_.encode_task_runner(),
context_.network_task_runner());
@@ -251,6 +251,7 @@ class ChromotingHostTest : public testing::Test {
protocol::ConnectionToClient* connection_ptr = connection.get();
scoped_refptr<ClientSession> client = new ClientSession(
host_.get(),
+ context_.audio_task_runner(),
context_.capture_task_runner(),
context_.encode_task_runner(),
context_.network_task_runner(),
@@ -299,8 +300,7 @@ class ChromotingHostTest : public testing::Test {
DesktopEnvironment* CreateDesktopEnvironment(ClientSession* client) {
scoped_ptr<EventExecutor> event_executor(new EventExecutorFake());
scoped_ptr<VideoFrameCapturer> video_capturer(new VideoFrameCapturerFake());
- return new DesktopEnvironment(scoped_ptr<AudioCapturer>(NULL),
- event_executor.Pass(),
+ return new DesktopEnvironment(event_executor.Pass(),
video_capturer.Pass());
}

Powered by Google App Engine
This is Rietveld 408576698