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

Side by Side Diff: chrome/browser/extensions/api/messaging/native_message_process_host.cc

Issue 591463003: Remote Assistance on Chrome OS Part III - NativeMessageHost (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@native_messaging
Patch Set: Add NativeMessagePort::Core Created 6 years, 2 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 #include "chrome/browser/extensions/api/messaging/native_message_process_host.h" 5 #include "chrome/browser/extensions/api/messaging/native_message_process_host.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/files/file_path.h" 8 #include "base/files/file_path.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/prefs/pref_service.h"
11 #include "base/process/kill.h" 10 #include "base/process/kill.h"
12 #include "base/threading/sequenced_worker_pool.h" 11 #include "base/threading/sequenced_worker_pool.h"
13 #include "base/values.h"
14 #include "chrome/browser/extensions/api/messaging/native_messaging_host_manifest .h" 12 #include "chrome/browser/extensions/api/messaging/native_messaging_host_manifest .h"
15 #include "chrome/browser/extensions/api/messaging/native_process_launcher.h" 13 #include "chrome/browser/extensions/api/messaging/native_process_launcher.h"
16 #include "chrome/common/chrome_version_info.h" 14 #include "chrome/common/chrome_version_info.h"
17 #include "content/public/browser/browser_thread.h" 15 #include "content/public/browser/browser_thread.h"
18 #include "extensions/browser/pref_names.h"
19 #include "extensions/common/constants.h" 16 #include "extensions/common/constants.h"
20 #include "extensions/common/features/feature.h" 17 #include "extensions/common/features/feature.h"
21 #include "net/base/file_stream.h" 18 #include "net/base/file_stream.h"
22 #include "net/base/io_buffer.h" 19 #include "net/base/io_buffer.h"
23 #include "net/base/net_errors.h" 20 #include "net/base/net_errors.h"
24 #include "net/base/net_util.h" 21 #include "net/base/net_util.h"
25 #include "url/gurl.h" 22 #include "url/gurl.h"
26 23
27 namespace { 24 namespace {
28 25
(...skipping 15 matching lines...) Expand all
44 const char kNotFoundError[] = "Specified native messaging host not found."; 41 const char kNotFoundError[] = "Specified native messaging host not found.";
45 const char kForbiddenError[] = 42 const char kForbiddenError[] =
46 "Access to the specified native messaging host is forbidden."; 43 "Access to the specified native messaging host is forbidden.";
47 const char kHostInputOuputError[] = 44 const char kHostInputOuputError[] =
48 "Error when communicating with the native messaging host."; 45 "Error when communicating with the native messaging host.";
49 46
50 } // namespace 47 } // namespace
51 48
52 namespace extensions { 49 namespace extensions {
53 50
54 // static
55 NativeMessageProcessHost::PolicyPermission
56 NativeMessageProcessHost::IsHostAllowed(const PrefService* pref_service,
57 const std::string& native_host_name) {
58 NativeMessageProcessHost::PolicyPermission allow_result = ALLOW_ALL;
59 if (pref_service->IsManagedPreference(
60 pref_names::kNativeMessagingUserLevelHosts)) {
61 if (!pref_service->GetBoolean(pref_names::kNativeMessagingUserLevelHosts))
62 allow_result = ALLOW_SYSTEM_ONLY;
63 }
64
65 // All native messaging hosts are allowed if there is no blacklist.
66 if (!pref_service->IsManagedPreference(pref_names::kNativeMessagingBlacklist))
67 return allow_result;
68 const base::ListValue* blacklist =
69 pref_service->GetList(pref_names::kNativeMessagingBlacklist);
70 if (!blacklist)
71 return allow_result;
72
73 // Check if the name or the wildcard is in the blacklist.
74 base::StringValue name_value(native_host_name);
75 base::StringValue wildcard_value("*");
76 if (blacklist->Find(name_value) == blacklist->end() &&
77 blacklist->Find(wildcard_value) == blacklist->end()) {
78 return allow_result;
79 }
80
81 // The native messaging host is blacklisted. Check the whitelist.
82 if (pref_service->IsManagedPreference(
83 pref_names::kNativeMessagingWhitelist)) {
84 const base::ListValue* whitelist =
85 pref_service->GetList(pref_names::kNativeMessagingWhitelist);
86 if (whitelist && whitelist->Find(name_value) != whitelist->end())
87 return allow_result;
88 }
89
90 return DISALLOW;
91 }
92
93 NativeMessageProcessHost::NativeMessageProcessHost( 51 NativeMessageProcessHost::NativeMessageProcessHost(
94 base::WeakPtr<Client> weak_client_ui,
95 const std::string& source_extension_id, 52 const std::string& source_extension_id,
96 const std::string& native_host_name, 53 const std::string& native_host_name,
97 int destination_port,
98 scoped_ptr<NativeProcessLauncher> launcher) 54 scoped_ptr<NativeProcessLauncher> launcher)
99 : weak_client_ui_(weak_client_ui), 55 : source_extension_id_(source_extension_id),
100 source_extension_id_(source_extension_id),
101 native_host_name_(native_host_name), 56 native_host_name_(native_host_name),
102 destination_port_(destination_port),
103 launcher_(launcher.Pass()), 57 launcher_(launcher.Pass()),
104 closed_(false), 58 closed_(false),
105 process_handle_(base::kNullProcessHandle), 59 process_handle_(base::kNullProcessHandle),
106 #if defined(OS_POSIX) 60 #if defined(OS_POSIX)
107 read_file_(-1), 61 read_file_(-1),
108 #endif 62 #endif
109 read_pending_(false), 63 read_pending_(false),
110 write_pending_(false) { 64 write_pending_(false) {
111 DCHECK_CURRENTLY_ON(content::BrowserThread::UI); 65 DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
112 66
67 task_runner_ = content::BrowserThread::GetMessageLoopProxyForThread(
68 content::BrowserThread::IO);
113 // It's safe to use base::Unretained() here because NativeMessagePort always 69 // It's safe to use base::Unretained() here because NativeMessagePort always
114 // deletes us on the IO thread. 70 // deletes us on the IO thread.
115 content::BrowserThread::PostTask(content::BrowserThread::IO, FROM_HERE, 71 task_runner_->PostTask(
72 FROM_HERE,
116 base::Bind(&NativeMessageProcessHost::LaunchHostProcess, 73 base::Bind(&NativeMessageProcessHost::LaunchHostProcess,
117 base::Unretained(this))); 74 base::Unretained(this)));
118 } 75 }
119 76
120 NativeMessageProcessHost::~NativeMessageProcessHost() { 77 NativeMessageProcessHost::~NativeMessageProcessHost() {
121 DCHECK_CURRENTLY_ON(content::BrowserThread::IO); 78 DCHECK(task_runner_->BelongsToCurrentThread());
122 Close(std::string());
123 } 79 }
124 80
125 // static 81 // static
126 scoped_ptr<NativeMessageProcessHost> NativeMessageProcessHost::Create( 82 scoped_ptr<NativeMessageHost> NativeMessageHost::Create(
127 gfx::NativeView native_view, 83 gfx::NativeView native_view,
128 base::WeakPtr<Client> weak_client_ui,
129 const std::string& source_extension_id, 84 const std::string& source_extension_id,
130 const std::string& native_host_name, 85 const std::string& native_host_name,
131 int destination_port,
132 bool allow_user_level) { 86 bool allow_user_level) {
133 return CreateWithLauncher(weak_client_ui, source_extension_id, 87 return NativeMessageProcessHost::CreateWithLauncher(
134 native_host_name, destination_port, 88 source_extension_id,
135 NativeProcessLauncher::CreateDefault( 89 native_host_name,
136 allow_user_level, native_view)); 90 NativeProcessLauncher::CreateDefault(allow_user_level, native_view));
137 } 91 }
138 92
139 // static 93 // static
140 scoped_ptr<NativeMessageProcessHost> 94 scoped_ptr<NativeMessageHost> NativeMessageProcessHost::CreateWithLauncher(
141 NativeMessageProcessHost::CreateWithLauncher(
142 base::WeakPtr<Client> weak_client_ui,
143 const std::string& source_extension_id, 95 const std::string& source_extension_id,
144 const std::string& native_host_name, 96 const std::string& native_host_name,
145 int destination_port,
146 scoped_ptr<NativeProcessLauncher> launcher) { 97 scoped_ptr<NativeProcessLauncher> launcher) {
147 DCHECK_CURRENTLY_ON(content::BrowserThread::UI); 98 DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
148 99
149 scoped_ptr<NativeMessageProcessHost> process(new NativeMessageProcessHost( 100 scoped_ptr<NativeMessageHost> process(
150 weak_client_ui, source_extension_id, native_host_name, 101 new NativeMessageProcessHost(source_extension_id,
151 destination_port, launcher.Pass())); 102 native_host_name,
103 launcher.Pass()));
152 104
153 return process.Pass(); 105 return process.Pass();
154 } 106 }
155 107
156 void NativeMessageProcessHost::LaunchHostProcess() { 108 void NativeMessageProcessHost::LaunchHostProcess() {
157 DCHECK_CURRENTLY_ON(content::BrowserThread::IO); 109 DCHECK(task_runner_->BelongsToCurrentThread());
158 110
159 GURL origin(std::string(kExtensionScheme) + "://" + source_extension_id_); 111 GURL origin(std::string(kExtensionScheme) + "://" + source_extension_id_);
160 launcher_->Launch(origin, native_host_name_, 112 launcher_->Launch(origin, native_host_name_,
161 base::Bind(&NativeMessageProcessHost::OnHostProcessLaunched, 113 base::Bind(&NativeMessageProcessHost::OnHostProcessLaunched,
162 base::Unretained(this))); 114 base::Unretained(this)));
163 } 115 }
164 116
165 void NativeMessageProcessHost::OnHostProcessLaunched( 117 void NativeMessageProcessHost::OnHostProcessLaunched(
166 NativeProcessLauncher::LaunchResult result, 118 NativeProcessLauncher::LaunchResult result,
167 base::ProcessHandle process_handle, 119 base::ProcessHandle process_handle,
168 base::File read_file, 120 base::File read_file,
169 base::File write_file) { 121 base::File write_file) {
170 DCHECK_CURRENTLY_ON(content::BrowserThread::IO); 122 DCHECK(task_runner_->BelongsToCurrentThread());
171 123
172 switch (result) { 124 switch (result) {
173 case NativeProcessLauncher::RESULT_INVALID_NAME: 125 case NativeProcessLauncher::RESULT_INVALID_NAME:
174 Close(kInvalidNameError); 126 Close(kInvalidNameError);
175 return; 127 return;
176 case NativeProcessLauncher::RESULT_NOT_FOUND: 128 case NativeProcessLauncher::RESULT_NOT_FOUND:
177 Close(kNotFoundError); 129 Close(kNotFoundError);
178 return; 130 return;
179 case NativeProcessLauncher::RESULT_FORBIDDEN: 131 case NativeProcessLauncher::RESULT_FORBIDDEN:
180 Close(kForbiddenError); 132 Close(kForbiddenError);
(...skipping 16 matching lines...) Expand all
197 GetTaskRunnerWithShutdownBehavior( 149 GetTaskRunnerWithShutdownBehavior(
198 base::SequencedWorkerPool::SKIP_ON_SHUTDOWN)); 150 base::SequencedWorkerPool::SKIP_ON_SHUTDOWN));
199 151
200 read_stream_.reset(new net::FileStream(read_file.Pass(), task_runner)); 152 read_stream_.reset(new net::FileStream(read_file.Pass(), task_runner));
201 write_stream_.reset(new net::FileStream(write_file.Pass(), task_runner)); 153 write_stream_.reset(new net::FileStream(write_file.Pass(), task_runner));
202 154
203 WaitRead(); 155 WaitRead();
204 DoWrite(); 156 DoWrite();
205 } 157 }
206 158
207 void NativeMessageProcessHost::Send(const std::string& json) { 159 void NativeMessageProcessHost::OnMessage(const std::string& json) {
208 DCHECK_CURRENTLY_ON(content::BrowserThread::IO); 160 DCHECK(task_runner_->BelongsToCurrentThread());
209 161
210 if (closed_) 162 if (closed_)
211 return; 163 return;
212 164
213 // Allocate new buffer for the message. 165 // Allocate new buffer for the message.
214 scoped_refptr<net::IOBufferWithSize> buffer = 166 scoped_refptr<net::IOBufferWithSize> buffer =
215 new net::IOBufferWithSize(json.size() + kMessageHeaderSize); 167 new net::IOBufferWithSize(json.size() + kMessageHeaderSize);
216 168
217 // Copy size and content of the message to the buffer. 169 // Copy size and content of the message to the buffer.
218 COMPILE_ASSERT(sizeof(uint32) == kMessageHeaderSize, incorrect_header_size); 170 COMPILE_ASSERT(sizeof(uint32) == kMessageHeaderSize, incorrect_header_size);
219 *reinterpret_cast<uint32*>(buffer->data()) = json.size(); 171 *reinterpret_cast<uint32*>(buffer->data()) = json.size();
220 memcpy(buffer->data() + kMessageHeaderSize, json.data(), json.size()); 172 memcpy(buffer->data() + kMessageHeaderSize, json.data(), json.size());
221 173
222 // Push new message to the write queue. 174 // Push new message to the write queue.
223 write_queue_.push(buffer); 175 write_queue_.push(buffer);
224 176
225 // Send() may be called before the host process is started. In that case the 177 // Send() may be called before the host process is started. In that case the
226 // message will be written when OnHostProcessLaunched() is called. If it's 178 // message will be written when OnHostProcessLaunched() is called. If it's
227 // already started then write the message now. 179 // already started then write the message now.
228 if (write_stream_) 180 if (write_stream_)
229 DoWrite(); 181 DoWrite();
230 } 182 }
231 183
184 void NativeMessageProcessHost::set_client(Client* client) {
185 client_ = client;
Sergey Ulanov 2014/10/01 23:23:59 add DCHECK(task_runner_->BelongsToCurrentThread())
kelvinp 2014/10/02 03:12:17 Done.
Sergey Ulanov 2014/10/02 23:09:59 I still don't see DCHECK here :)
186 }
187
188 scoped_refptr<base::SingleThreadTaskRunner>
189 NativeMessageProcessHost::task_runner() const {
190 return task_runner_;
191 }
192
232 #if defined(OS_POSIX) 193 #if defined(OS_POSIX)
233 void NativeMessageProcessHost::OnFileCanReadWithoutBlocking(int fd) { 194 void NativeMessageProcessHost::OnFileCanReadWithoutBlocking(int fd) {
234 DCHECK_EQ(fd, read_file_); 195 DCHECK_EQ(fd, read_file_);
235 DoRead(); 196 DoRead();
236 } 197 }
237 198
238 void NativeMessageProcessHost::OnFileCanWriteWithoutBlocking(int fd) { 199 void NativeMessageProcessHost::OnFileCanWriteWithoutBlocking(int fd) {
239 NOTREACHED(); 200 NOTREACHED();
240 } 201 }
241 #endif // !defined(OS_POSIX) 202 #endif // !defined(OS_POSIX)
(...skipping 15 matching lines...) Expand all
257 #if defined(OS_POSIX) 218 #if defined(OS_POSIX)
258 base::MessageLoopForIO::current()->WatchFileDescriptor( 219 base::MessageLoopForIO::current()->WatchFileDescriptor(
259 read_file_, false /* persistent */, 220 read_file_, false /* persistent */,
260 base::MessageLoopForIO::WATCH_READ, &read_watcher_, this); 221 base::MessageLoopForIO::WATCH_READ, &read_watcher_, this);
261 #else // defined(OS_POSIX) 222 #else // defined(OS_POSIX)
262 DoRead(); 223 DoRead();
263 #endif // defined(!OS_POSIX) 224 #endif // defined(!OS_POSIX)
264 } 225 }
265 226
266 void NativeMessageProcessHost::DoRead() { 227 void NativeMessageProcessHost::DoRead() {
267 DCHECK_CURRENTLY_ON(content::BrowserThread::IO); 228 DCHECK(task_runner_->BelongsToCurrentThread());
268 229
269 while (!closed_ && !read_pending_) { 230 while (!closed_ && !read_pending_) {
270 read_buffer_ = new net::IOBuffer(kReadBufferSize); 231 read_buffer_ = new net::IOBuffer(kReadBufferSize);
271 int result = read_stream_->Read( 232 int result = read_stream_->Read(
272 read_buffer_.get(), 233 read_buffer_.get(),
273 kReadBufferSize, 234 kReadBufferSize,
274 base::Bind(&NativeMessageProcessHost::OnRead, base::Unretained(this))); 235 base::Bind(&NativeMessageProcessHost::OnRead, base::Unretained(this)));
275 HandleReadResult(result); 236 HandleReadResult(result);
276 } 237 }
277 } 238 }
278 239
279 void NativeMessageProcessHost::OnRead(int result) { 240 void NativeMessageProcessHost::OnRead(int result) {
280 DCHECK_CURRENTLY_ON(content::BrowserThread::IO); 241 DCHECK(task_runner_->BelongsToCurrentThread());
281 DCHECK(read_pending_); 242 DCHECK(read_pending_);
282 read_pending_ = false; 243 read_pending_ = false;
283 244
284 HandleReadResult(result); 245 HandleReadResult(result);
285 WaitRead(); 246 WaitRead();
286 } 247 }
287 248
288 void NativeMessageProcessHost::HandleReadResult(int result) { 249 void NativeMessageProcessHost::HandleReadResult(int result) {
289 DCHECK_CURRENTLY_ON(content::BrowserThread::IO); 250 DCHECK(task_runner_->BelongsToCurrentThread());
290 251
291 if (closed_) 252 if (closed_)
292 return; 253 return;
293 254
294 if (result > 0) { 255 if (result > 0) {
295 ProcessIncomingData(read_buffer_->data(), result); 256 ProcessIncomingData(read_buffer_->data(), result);
296 } else if (result == net::ERR_IO_PENDING) { 257 } else if (result == net::ERR_IO_PENDING) {
297 read_pending_ = true; 258 read_pending_ = true;
298 } else if (result == 0 || result == net::ERR_CONNECTION_RESET) { 259 } else if (result == 0 || result == net::ERR_CONNECTION_RESET) {
299 // On Windows we get net::ERR_CONNECTION_RESET for a broken pipe, while on 260 // On Windows we get net::ERR_CONNECTION_RESET for a broken pipe, while on
300 // Posix read() returns 0 in that case. 261 // Posix read() returns 0 in that case.
301 Close(kNativeHostExited); 262 Close(kNativeHostExited);
302 } else { 263 } else {
303 LOG(ERROR) << "Error when reading from Native Messaging host: " << result; 264 LOG(ERROR) << "Error when reading from Native Messaging host: " << result;
304 Close(kHostInputOuputError); 265 Close(kHostInputOuputError);
305 } 266 }
306 } 267 }
307 268
308 void NativeMessageProcessHost::ProcessIncomingData( 269 void NativeMessageProcessHost::ProcessIncomingData(
309 const char* data, int data_size) { 270 const char* data, int data_size) {
310 DCHECK_CURRENTLY_ON(content::BrowserThread::IO); 271 DCHECK(task_runner_->BelongsToCurrentThread());
311 272
312 incoming_data_.append(data, data_size); 273 incoming_data_.append(data, data_size);
313 274
314 while (true) { 275 while (true) {
315 if (incoming_data_.size() < kMessageHeaderSize) 276 if (incoming_data_.size() < kMessageHeaderSize)
316 return; 277 return;
317 278
318 size_t message_size = 279 size_t message_size =
319 *reinterpret_cast<const uint32*>(incoming_data_.data()); 280 *reinterpret_cast<const uint32*>(incoming_data_.data());
320 281
321 if (message_size > kMaximumMessageSize) { 282 if (message_size > kMaximumMessageSize) {
322 LOG(ERROR) << "Native Messaging host tried sending a message that is " 283 LOG(ERROR) << "Native Messaging host tried sending a message that is "
323 << message_size << " bytes long."; 284 << message_size << " bytes long.";
324 Close(kHostInputOuputError); 285 Close(kHostInputOuputError);
325 return; 286 return;
326 } 287 }
327 288
328 if (incoming_data_.size() < message_size + kMessageHeaderSize) 289 if (incoming_data_.size() < message_size + kMessageHeaderSize)
329 return; 290 return;
330 291
331 content::BrowserThread::PostTask(content::BrowserThread::UI, FROM_HERE, 292 client_->PostMessageFromNativeHost(
332 base::Bind(&Client::PostMessageFromNativeProcess, weak_client_ui_, 293 incoming_data_.substr(kMessageHeaderSize, message_size));
333 destination_port_,
334 incoming_data_.substr(kMessageHeaderSize, message_size)));
335 294
336 incoming_data_.erase(0, kMessageHeaderSize + message_size); 295 incoming_data_.erase(0, kMessageHeaderSize + message_size);
337 } 296 }
338 } 297 }
339 298
340 void NativeMessageProcessHost::DoWrite() { 299 void NativeMessageProcessHost::DoWrite() {
341 DCHECK_CURRENTLY_ON(content::BrowserThread::IO); 300 DCHECK(task_runner_->BelongsToCurrentThread());
342 301
343 while (!write_pending_ && !closed_) { 302 while (!write_pending_ && !closed_) {
344 if (!current_write_buffer_.get() || 303 if (!current_write_buffer_.get() ||
345 !current_write_buffer_->BytesRemaining()) { 304 !current_write_buffer_->BytesRemaining()) {
346 if (write_queue_.empty()) 305 if (write_queue_.empty())
347 return; 306 return;
348 current_write_buffer_ = new net::DrainableIOBuffer( 307 current_write_buffer_ = new net::DrainableIOBuffer(
349 write_queue_.front().get(), write_queue_.front()->size()); 308 write_queue_.front().get(), write_queue_.front()->size());
350 write_queue_.pop(); 309 write_queue_.pop();
351 } 310 }
352 311
353 int result = 312 int result =
354 write_stream_->Write(current_write_buffer_.get(), 313 write_stream_->Write(current_write_buffer_.get(),
355 current_write_buffer_->BytesRemaining(), 314 current_write_buffer_->BytesRemaining(),
356 base::Bind(&NativeMessageProcessHost::OnWritten, 315 base::Bind(&NativeMessageProcessHost::OnWritten,
357 base::Unretained(this))); 316 base::Unretained(this)));
358 HandleWriteResult(result); 317 HandleWriteResult(result);
359 } 318 }
360 } 319 }
361 320
362 void NativeMessageProcessHost::HandleWriteResult(int result) { 321 void NativeMessageProcessHost::HandleWriteResult(int result) {
363 DCHECK_CURRENTLY_ON(content::BrowserThread::IO); 322 DCHECK(task_runner_->BelongsToCurrentThread());
364 323
365 if (result <= 0) { 324 if (result <= 0) {
366 if (result == net::ERR_IO_PENDING) { 325 if (result == net::ERR_IO_PENDING) {
367 write_pending_ = true; 326 write_pending_ = true;
368 } else { 327 } else {
369 LOG(ERROR) << "Error when writing to Native Messaging host: " << result; 328 LOG(ERROR) << "Error when writing to Native Messaging host: " << result;
370 Close(kHostInputOuputError); 329 Close(kHostInputOuputError);
371 } 330 }
372 return; 331 return;
373 } 332 }
374 333
375 current_write_buffer_->DidConsume(result); 334 current_write_buffer_->DidConsume(result);
376 } 335 }
377 336
378 void NativeMessageProcessHost::OnWritten(int result) { 337 void NativeMessageProcessHost::OnWritten(int result) {
379 DCHECK_CURRENTLY_ON(content::BrowserThread::IO); 338 DCHECK(task_runner_->BelongsToCurrentThread());
380 339
381 DCHECK(write_pending_); 340 DCHECK(write_pending_);
382 write_pending_ = false; 341 write_pending_ = false;
383 342
384 HandleWriteResult(result); 343 HandleWriteResult(result);
385 DoWrite(); 344 DoWrite();
386 } 345 }
387 346
388 void NativeMessageProcessHost::Close(const std::string& error_message) { 347 void NativeMessageProcessHost::Close(const std::string& error_message) {
389 DCHECK_CURRENTLY_ON(content::BrowserThread::IO); 348 DCHECK(task_runner_->BelongsToCurrentThread());
390 349
391 if (!closed_) { 350 if (!closed_) {
392 closed_ = true; 351 closed_ = true;
393 read_stream_.reset(); 352 read_stream_.reset();
394 write_stream_.reset(); 353 write_stream_.reset();
395 content::BrowserThread::PostTask(content::BrowserThread::UI, FROM_HERE, 354 client_->CloseChannel(error_message);
396 base::Bind(&Client::CloseChannel, weak_client_ui_,
397 destination_port_, error_message));
398 } 355 }
399 356
400 if (process_handle_ != base::kNullProcessHandle) { 357 if (process_handle_ != base::kNullProcessHandle) {
401 // Kill the host process if necessary to make sure we don't leave zombies. 358 // Kill the host process if necessary to make sure we don't leave zombies.
402 // On OSX base::EnsureProcessTerminated() may block, so we have to post a 359 // On OSX base::EnsureProcessTerminated() may block, so we have to post a
403 // task on the blocking pool. 360 // task on the blocking pool.
404 #if defined(OS_MACOSX) 361 #if defined(OS_MACOSX)
405 content::BrowserThread::PostBlockingPoolTask( 362 content::BrowserThread::PostBlockingPoolTask(
406 FROM_HERE, base::Bind(&base::EnsureProcessTerminated, process_handle_)); 363 FROM_HERE, base::Bind(&base::EnsureProcessTerminated, process_handle_));
407 #else 364 #else
408 base::EnsureProcessTerminated(process_handle_); 365 base::EnsureProcessTerminated(process_handle_);
409 #endif 366 #endif
410 process_handle_ = base::kNullProcessHandle; 367 process_handle_ = base::kNullProcessHandle;
411 } 368 }
412 } 369 }
413 370
414 } // namespace extensions 371 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698