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

Unified Diff: remoting/host/chromoting_host_unittest.cc

Issue 7262015: Conenct Chromoting plugin debug log to JS UI. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge Created 9 years, 5 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/plugin/host_plugin_logger.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 be6565ac1424f393b3731fe61bdbe9c581446003..9d238fa283f4aa89cc42da571dad905352926d98 100644
--- a/remoting/host/chromoting_host_unittest.cc
+++ b/remoting/host/chromoting_host_unittest.cc
@@ -5,6 +5,7 @@
#include "base/bind.h"
#include "base/memory/scoped_ptr.h"
#include "base/task.h"
+#include "remoting/base/logger.h"
#include "remoting/host/capturer_fake.h"
#include "remoting/host/chromoting_host.h"
#include "remoting/host/chromoting_host_context.h"
@@ -86,6 +87,8 @@ class ChromotingHostTest : public testing::Test {
EXPECT_CALL(context_, ui_message_loop())
.Times(AnyNumber());
+ logger_.reset(new Logger());
+
context_.SetUITaskPostFunction(base::Bind(
static_cast<void(MessageLoop::*)(
const tracked_objects::Location&, Task*)>(&MessageLoop::PostTask),
@@ -104,7 +107,7 @@ class ChromotingHostTest : public testing::Test {
MockAccessVerifier* access_verifier = new MockAccessVerifier();
host_ = ChromotingHost::Create(&context_, config_,
- desktop, access_verifier);
+ desktop, access_verifier, logger_.get());
credentials_.set_type(protocol::PASSWORD);
credentials_.set_username("user");
credentials_.set_credential("password");
@@ -205,6 +208,7 @@ class ChromotingHostTest : public testing::Test {
}
protected:
+ scoped_ptr<Logger> logger_;
MessageLoop message_loop_;
MockConnectionToClientEventHandler handler_;
scoped_refptr<ChromotingHost> host_;
@@ -229,7 +233,7 @@ class ChromotingHostTest : public testing::Test {
MockEventExecutor* event_executor_;
MockCurtain* curtain_;
MockDisconnectWindow* disconnect_window_;
- ContinueWindow* continue_window_;
+ MockContinueWindow* continue_window_;
MockLocalInputMonitor* local_input_monitor_;
};
« no previous file with comments | « remoting/host/chromoting_host.cc ('k') | remoting/host/plugin/host_plugin_logger.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698