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

Unified Diff: remoting/host/chromoting_host_unittest.cc

Issue 12594009: Converted LocalInputMonitor into a SessionController instance. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased 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 | « remoting/host/chromoting_host.cc ('k') | remoting/host/client_session_control.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/chromoting_host_unittest.cc
diff --git a/remoting/host/chromoting_host_unittest.cc b/remoting/host/chromoting_host_unittest.cc
index 11593679d08e6950501ed2dcd6447fcc88133afa..d7df7093e6551fb3228f40d59df331eef930c93c 100644
--- a/remoting/host/chromoting_host_unittest.cc
+++ b/remoting/host/chromoting_host_unittest.cc
@@ -70,8 +70,7 @@ class MockIt2MeHostUserInterface : public It2MeHostUserInterface {
void InitFrom(
scoped_ptr<DisconnectWindow> disconnect_window,
- scoped_ptr<ContinueWindow> continue_window,
- scoped_ptr<LocalInputMonitor> local_input_monitor);
+ scoped_ptr<ContinueWindow> continue_window);
// A test-only version of Start that does not register a HostStatusObserver.
// TODO(rmsousa): Make the unit tests work with the regular Start().
@@ -87,13 +86,11 @@ MockIt2MeHostUserInterface::MockIt2MeHostUserInterface(
void MockIt2MeHostUserInterface::InitFrom(
scoped_ptr<DisconnectWindow> disconnect_window,
- scoped_ptr<ContinueWindow> continue_window,
- scoped_ptr<LocalInputMonitor> local_input_monitor) {
+ scoped_ptr<ContinueWindow> continue_window) {
DCHECK(ui_task_runner()->BelongsToCurrentThread());
disconnect_window_ = disconnect_window.Pass();
continue_window_ = continue_window.Pass();
- local_input_monitor_ = local_input_monitor.Pass();
}
void MockIt2MeHostUserInterface::Start(
@@ -141,13 +138,11 @@ class ChromotingHostTest : public testing::Test {
disconnect_window_ = new MockDisconnectWindow();
continue_window_ = new MockContinueWindow();
- local_input_monitor_ = new MockLocalInputMonitor();
it2me_host_user_interface_.reset(
new MockIt2MeHostUserInterface(ui_task_runner_, ui_task_runner_));
it2me_host_user_interface_->InitFrom(
scoped_ptr<DisconnectWindow>(disconnect_window_),
- scoped_ptr<ContinueWindow>(continue_window_),
- scoped_ptr<LocalInputMonitor>(local_input_monitor_));
+ scoped_ptr<ContinueWindow>(continue_window_));
it2me_host_user_interface_->Start(
host_, base::Bind(&ChromotingHost::Shutdown, host_, base::Closure()));
@@ -499,7 +494,6 @@ class ChromotingHostTest : public testing::Test {
// Owned by |host_|.
MockDisconnectWindow* disconnect_window_;
MockContinueWindow* continue_window_;
- MockLocalInputMonitor* local_input_monitor_;
MockConnectionToClient*& get_connection(int connection_index) {
return (connection_index == 0) ? connection1_ : connection2_;
« no previous file with comments | « remoting/host/chromoting_host.cc ('k') | remoting/host/client_session_control.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698