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

Unified Diff: remoting/host/chromoting_host_unittest.cc

Issue 11028128: [Chromoting] Request the daemon to open a terminal once a connection has been accepted. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: CR feeback and rebased on top of https://chromiumcodereview.appspot.com/11017065/ 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 cd27486b9c3059c7c2f8e41a84388627a801617c..0a6e080a8602b05bc5c8d5466844e69891526aa8 100644
--- a/remoting/host/chromoting_host_unittest.cc
+++ b/remoting/host/chromoting_host_unittest.cc
@@ -71,7 +71,8 @@ class MockDesktopEnvironmentFactory : public DesktopEnvironmentFactory {
MockDesktopEnvironmentFactory();
virtual ~MockDesktopEnvironmentFactory();
- virtual scoped_ptr<DesktopEnvironment> Create() OVERRIDE;
+ virtual scoped_ptr<DesktopEnvironment> Create(
+ scoped_refptr<ChromotingHost> host) OVERRIDE;
private:
DISALLOW_COPY_AND_ASSIGN(MockDesktopEnvironmentFactory);
@@ -84,7 +85,8 @@ MockDesktopEnvironmentFactory::MockDesktopEnvironmentFactory()
MockDesktopEnvironmentFactory::~MockDesktopEnvironmentFactory() {
}
-scoped_ptr<DesktopEnvironment> MockDesktopEnvironmentFactory::Create() {
+scoped_ptr<DesktopEnvironment> MockDesktopEnvironmentFactory::Create(
+ scoped_refptr<ChromotingHost> host) {
scoped_ptr<EventExecutor> event_executor(new EventExecutorFake());
scoped_ptr<VideoFrameCapturer> video_capturer(new VideoFrameCapturerFake());
return scoped_ptr<DesktopEnvironment>(new DesktopEnvironment(
@@ -228,7 +230,7 @@ class ChromotingHostTest : public testing::Test {
PassAs<protocol::ConnectionToClient>();
protocol::ConnectionToClient* connection_ptr = connection.get();
scoped_ptr<DesktopEnvironment> desktop_environment =
- host_->desktop_environment_factory_->Create();
+ host_->desktop_environment_factory_->Create(host_);
connection_ptr->set_input_stub(desktop_environment->event_executor());
scoped_refptr<ClientSession> client = new ClientSession(

Powered by Google App Engine
This is Rietveld 408576698