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

Unified Diff: remoting/host/chromoting_host_unittest.cc

Issue 8725016: Refactor IT2Me-specific functions into a HostObserver subclass. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove unused header Created 9 years, 1 month 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 ad2bca8a4e60b526878bdebc71acfa5cbcc1d3fd..a4f08ea651fbef711a8076beeb8683977ddba3b0 100644
--- a/remoting/host/chromoting_host_unittest.cc
+++ b/remoting/host/chromoting_host_unittest.cc
@@ -11,6 +11,7 @@
#include "remoting/host/chromoting_host_context.h"
#include "remoting/host/host_mock_objects.h"
#include "remoting/host/in_memory_host_config.h"
+#include "remoting/host/it2me_observer.h"
#include "remoting/proto/video.pb.h"
#include "remoting/protocol/protocol_mock_objects.h"
#include "remoting/protocol/session_config.h"
@@ -90,18 +91,22 @@ class ChromotingHostTest : public testing::Test {
Capturer* capturer = new CapturerFake();
event_executor_ = new MockEventExecutor();
curtain_ = new MockCurtain();
- disconnect_window_ = new MockDisconnectWindow();
- continue_window_ = new MockContinueWindow();
- local_input_monitor_ = new MockLocalInputMonitor();
desktop_environment_.reset(
- new DesktopEnvironment(&context_, capturer, event_executor_, curtain_,
- disconnect_window_, continue_window_,
- local_input_monitor_));
+ new DesktopEnvironment(&context_, capturer, event_executor_, curtain_));
MockAccessVerifier* access_verifier = new MockAccessVerifier();
host_ = ChromotingHost::Create(&context_, config_,
desktop_environment_.get(),
access_verifier, false);
+
+ disconnect_window_ = new MockDisconnectWindow();
+ continue_window_ = new MockContinueWindow();
+ local_input_monitor_ = new MockLocalInputMonitor();
+ it2me_observer_.reset(new It2MeObserver(host_, &context_));
+ it2me_observer_->InitFrom(disconnect_window_, continue_window_,
+ local_input_monitor_);
+ host_->AddStatusObserver(it2me_observer_.get());
+
session_ = new MockSession();
session2_ = new MockSession();
session_config_ = SessionConfig::GetDefault();
@@ -217,6 +222,7 @@ class ChromotingHostTest : public testing::Test {
scoped_refptr<base::MessageLoopProxy> message_loop_proxy_;
MockConnectionToClientEventHandler handler_;
scoped_ptr<DesktopEnvironment> desktop_environment_;
+ scoped_ptr<It2MeObserver> it2me_observer_;
scoped_refptr<ChromotingHost> host_;
scoped_refptr<InMemoryHostConfig> config_;
MockChromotingHostContext context_;

Powered by Google App Engine
This is Rietveld 408576698