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

Unified Diff: remoting/host/simple_host_process.cc

Issue 6266023: Revert "Fix crashes in ChromotingHost" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 11 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/screen_recorder_unittest.cc ('k') | remoting/protocol/connection_to_client.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/simple_host_process.cc
diff --git a/remoting/host/simple_host_process.cc b/remoting/host/simple_host_process.cc
index 289da0f7a4f68f9e6225fd0e28fa84fef21990db..56ad378b0531c88de4d058c82dbb2d7f56024d10 100644
--- a/remoting/host/simple_host_process.cc
+++ b/remoting/host/simple_host_process.cc
@@ -32,7 +32,6 @@
#include "remoting/host/capturer_fake.h"
#include "remoting/host/chromoting_host.h"
#include "remoting/host/chromoting_host_context.h"
-#include "remoting/host/event_executor.h"
#include "remoting/host/json_host_config.h"
#include "remoting/proto/video.pb.h"
@@ -117,12 +116,9 @@ int main(int argc, char** argv) {
bool fake = cmd_line->HasSwitch(kFakeSwitchName);
if (fake) {
- remoting::Capturer* capturer =
- new remoting::CapturerFake(context.main_message_loop());
- remoting::protocol::InputStub* input_stub =
- CreateEventExecutor(context.main_message_loop(), capturer);
host = ChromotingHost::Create(
- &context, config, capturer, input_stub);
+ &context, config,
+ new remoting::CapturerFake(context.main_message_loop()));
} else {
host = ChromotingHost::Create(&context, config);
}
« no previous file with comments | « remoting/host/screen_recorder_unittest.cc ('k') | remoting/protocol/connection_to_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698