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

Unified Diff: remoting/host/screen_recorder_unittest.cc

Issue 6594138: Block event processing on host/client until the client has authenticated. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix merge conflict Created 9 years, 10 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 | « remoting/host/chromoting_host_unittest.cc ('k') | remoting/protocol/client_message_dispatcher.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/screen_recorder_unittest.cc
diff --git a/remoting/host/screen_recorder_unittest.cc b/remoting/host/screen_recorder_unittest.cc
index 412ce6d17523170b05f8e66a64816c9220d5e8f7..b4fa40a288e4a4225f97b6bf8332db3c6c4d47c4 100644
--- a/remoting/host/screen_recorder_unittest.cc
+++ b/remoting/host/screen_recorder_unittest.cc
@@ -13,6 +13,9 @@
#include "testing/gtest/include/gtest/gtest.h"
using ::remoting::protocol::MockConnectionToClient;
+using ::remoting::protocol::MockConnectionToClientEventHandler;
+using ::remoting::protocol::MockHostStub;
+using ::remoting::protocol::MockInputStub;
using ::remoting::protocol::MockVideoStub;
using ::testing::_;
@@ -77,7 +80,10 @@ class ScreenRecorderTest : public testing::Test {
virtual void SetUp() {
// Capturer and Encoder are owned by ScreenRecorder.
encoder_ = new MockEncoder();
- connection_ = new MockConnectionToClient();
+
+ connection_ = new MockConnectionToClient(&message_loop_, &handler_,
+ &host_stub_, &input_stub_);
+
record_ = new ScreenRecorder(
&message_loop_, &message_loop_, &message_loop_,
&capturer_, encoder_);
@@ -85,6 +91,10 @@ class ScreenRecorderTest : public testing::Test {
protected:
scoped_refptr<ScreenRecorder> record_;
+
+ MockConnectionToClientEventHandler handler_;
+ MockHostStub host_stub_;
+ MockInputStub input_stub_;
scoped_refptr<MockConnectionToClient> connection_;
// The following mock objects are owned by ScreenRecorder.
« no previous file with comments | « remoting/host/chromoting_host_unittest.cc ('k') | remoting/protocol/client_message_dispatcher.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698