diff options
| author | hclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-26 20:18:40 +0000 |
|---|---|---|
| committer | hclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-26 20:18:40 +0000 |
| commit | d462298cf2a54318e0f1ad0126ed0b3cab952f4f (patch) | |
| tree | a222a397c78cffbab3050b8d950ee65b9b305f66 /remoting/host/simple_host_process.cc | |
| parent | d931741758670a6310cdfc2a776f046e428e846b (diff) | |
| download | chromium_src-d462298cf2a54318e0f1ad0126ed0b3cab952f4f.zip chromium_src-d462298cf2a54318e0f1ad0126ed0b3cab952f4f.tar.gz chromium_src-d462298cf2a54318e0f1ad0126ed0b3cab952f4f.tar.bz2 | |
Revert "Fix crashes in ChromotingHost"
Reverting the patch since it exposed several memory leaks and threading
problems.
TBR=thakis
BUG=70935
TEST=None
Review URL: http://codereview.chromium.org/6266023
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72679 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/host/simple_host_process.cc')
| -rw-r--r-- | remoting/host/simple_host_process.cc | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/remoting/host/simple_host_process.cc b/remoting/host/simple_host_process.cc index 289da0f..56ad378 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); } |