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

Side by Side Diff: remoting/host/simple_host_process.cc

Issue 6266010: Fix crashes in ChromotingHost (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix comments 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « remoting/host/screen_recorder_unittest.cc ('k') | remoting/protocol/connection_to_client.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 // 4 //
5 // This is an application of a minimal host process in a Chromoting 5 // This is an application of a minimal host process in a Chromoting
6 // system. It serves the purpose of gluing different pieces together 6 // system. It serves the purpose of gluing different pieces together
7 // to make a functional host process for testing. 7 // to make a functional host process for testing.
8 // 8 //
9 // It peforms the following functionality: 9 // It peforms the following functionality:
10 // 1. Connect to the GTalk network and register the machine as a host. 10 // 1. Connect to the GTalk network and register the machine as a host.
(...skipping 14 matching lines...) Expand all
25 #include "base/logging.h" 25 #include "base/logging.h"
26 #include "base/mac/scoped_nsautorelease_pool.h" 26 #include "base/mac/scoped_nsautorelease_pool.h"
27 #include "base/nss_util.h" 27 #include "base/nss_util.h"
28 #include "base/path_service.h" 28 #include "base/path_service.h"
29 #include "base/threading/thread.h" 29 #include "base/threading/thread.h"
30 #include "media/base/media.h" 30 #include "media/base/media.h"
31 #include "remoting/base/tracer.h" 31 #include "remoting/base/tracer.h"
32 #include "remoting/host/capturer_fake.h" 32 #include "remoting/host/capturer_fake.h"
33 #include "remoting/host/chromoting_host.h" 33 #include "remoting/host/chromoting_host.h"
34 #include "remoting/host/chromoting_host_context.h" 34 #include "remoting/host/chromoting_host_context.h"
35 #include "remoting/host/event_executor.h"
35 #include "remoting/host/json_host_config.h" 36 #include "remoting/host/json_host_config.h"
36 #include "remoting/proto/video.pb.h" 37 #include "remoting/proto/video.pb.h"
37 38
38 using remoting::ChromotingHost; 39 using remoting::ChromotingHost;
39 using remoting::protocol::CandidateSessionConfig; 40 using remoting::protocol::CandidateSessionConfig;
40 using remoting::protocol::ChannelConfig; 41 using remoting::protocol::ChannelConfig;
41 using std::string; 42 using std::string;
42 using std::wstring; 43 using std::wstring;
43 44
44 #if defined(OS_WIN) 45 #if defined(OS_WIN)
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
109 FilePath module_path; 110 FilePath module_path;
110 PathService::Get(base::DIR_MODULE, &module_path); 111 PathService::Get(base::DIR_MODULE, &module_path);
111 CHECK(media::InitializeMediaLibrary(module_path)) 112 CHECK(media::InitializeMediaLibrary(module_path))
112 << "Cannot load media library"; 113 << "Cannot load media library";
113 114
114 // Construct a chromoting host. 115 // Construct a chromoting host.
115 scoped_refptr<ChromotingHost> host; 116 scoped_refptr<ChromotingHost> host;
116 117
117 bool fake = cmd_line->HasSwitch(kFakeSwitchName); 118 bool fake = cmd_line->HasSwitch(kFakeSwitchName);
118 if (fake) { 119 if (fake) {
120 remoting::Capturer* capturer =
121 new remoting::CapturerFake(context.main_message_loop());
122 remoting::protocol::InputStub* input_stub =
123 CreateEventExecutor(context.main_message_loop(), capturer);
119 host = ChromotingHost::Create( 124 host = ChromotingHost::Create(
120 &context, config, 125 &context, config, capturer, input_stub);
121 new remoting::CapturerFake(context.main_message_loop()));
122 } else { 126 } else {
123 host = ChromotingHost::Create(&context, config); 127 host = ChromotingHost::Create(&context, config);
124 } 128 }
125 129
126 if (cmd_line->HasSwitch(kVideoSwitchName)) { 130 if (cmd_line->HasSwitch(kVideoSwitchName)) {
127 string video_codec = cmd_line->GetSwitchValueASCII(kVideoSwitchName); 131 string video_codec = cmd_line->GetSwitchValueASCII(kVideoSwitchName);
128 scoped_ptr<CandidateSessionConfig> config( 132 scoped_ptr<CandidateSessionConfig> config(
129 CandidateSessionConfig::CreateDefault()); 133 CandidateSessionConfig::CreateDefault());
130 config->mutable_video_configs()->clear(); 134 config->mutable_video_configs()->clear();
131 135
(...skipping 21 matching lines...) Expand all
153 // Let the chromoting host run until the shutdown task is executed. 157 // Let the chromoting host run until the shutdown task is executed.
154 MessageLoop message_loop(MessageLoop::TYPE_UI); 158 MessageLoop message_loop(MessageLoop::TYPE_UI);
155 host->Start(NewRunnableFunction(&ShutdownTask, &message_loop)); 159 host->Start(NewRunnableFunction(&ShutdownTask, &message_loop));
156 message_loop.Run(); 160 message_loop.Run();
157 161
158 // And then stop the chromoting context. 162 // And then stop the chromoting context.
159 context.Stop(); 163 context.Stop();
160 file_io_thread.Stop(); 164 file_io_thread.Stop();
161 return 0; 165 return 0;
162 } 166 }
OLDNEW
« 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