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

Unified Diff: remoting/host/chromoting_host_unittest.cc

Issue 7655006: Revert 97050 - Add PluginMessageLoopProxy and use it for Host plugin UI thread. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 4 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_context_unittest.cc ('k') | remoting/host/desktop_environment.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/chromoting_host_unittest.cc
===================================================================
--- remoting/host/chromoting_host_unittest.cc (revision 97052)
+++ remoting/host/chromoting_host_unittest.cc (working copy)
@@ -78,7 +78,7 @@
ON_CALL(context_, network_message_loop())
.WillByDefault(Return(message_loop_proxy_.get()));
ON_CALL(context_, ui_message_loop())
- .WillByDefault(Return(message_loop_proxy_.get()));
+ .WillByDefault(Return(&message_loop_));
EXPECT_CALL(context_, main_message_loop())
.Times(AnyNumber());
EXPECT_CALL(context_, encode_message_loop())
@@ -88,6 +88,12 @@
EXPECT_CALL(context_, ui_message_loop())
.Times(AnyNumber());
+ context_.SetUITaskPostFunction(base::Bind(
+ static_cast<void(MessageLoop::*)(
+ const tracked_objects::Location&,
+ const base::Closure&)>(&MessageLoop::PostTask),
+ base::Unretained(&message_loop_)));
+
Capturer* capturer = new CapturerFake();
event_executor_ = new MockEventExecutor();
curtain_ = new MockCurtain();
« no previous file with comments | « remoting/host/chromoting_host_context_unittest.cc ('k') | remoting/host/desktop_environment.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698