OLD | NEW |
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 "content/zygote/zygote_linux.h" | 5 #include "content/zygote/zygote_linux.h" |
6 | 6 |
7 #include <errno.h> | 7 #include <errno.h> |
8 #include <fcntl.h> | 8 #include <fcntl.h> |
9 #include <poll.h> | 9 #include <poll.h> |
10 #include <signal.h> | 10 #include <signal.h> |
(...skipping 544 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
555 std::vector<base::ScopedFD> fds, | 555 std::vector<base::ScopedFD> fds, |
556 std::string* uma_name, | 556 std::string* uma_name, |
557 int* uma_sample, | 557 int* uma_sample, |
558 int* uma_boundary_value) { | 558 int* uma_boundary_value) { |
559 std::vector<std::string> args; | 559 std::vector<std::string> args; |
560 int argc = 0; | 560 int argc = 0; |
561 int numfds = 0; | 561 int numfds = 0; |
562 base::GlobalDescriptors::Mapping mapping; | 562 base::GlobalDescriptors::Mapping mapping; |
563 std::string process_type; | 563 std::string process_type; |
564 std::string channel_id; | 564 std::string channel_id; |
565 const std::string channel_id_prefix = std::string("--") | 565 const std::string channel_id_prefix = std::string("--") + |
566 + switches::kMojoChannelToken + std::string("="); | 566 switches::kServiceRequestChannelToken + |
| 567 std::string("="); |
567 | 568 |
568 if (!iter.ReadString(&process_type)) | 569 if (!iter.ReadString(&process_type)) |
569 return -1; | 570 return -1; |
570 if (!iter.ReadInt(&argc)) | 571 if (!iter.ReadInt(&argc)) |
571 return -1; | 572 return -1; |
572 | 573 |
573 for (int i = 0; i < argc; ++i) { | 574 for (int i = 0; i < argc; ++i) { |
574 std::string arg; | 575 std::string arg; |
575 if (!iter.ReadString(&arg)) | 576 if (!iter.ReadString(&arg)) |
576 return -1; | 577 return -1; |
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
664 bool Zygote::HandleGetSandboxStatus(int fd, base::PickleIterator iter) { | 665 bool Zygote::HandleGetSandboxStatus(int fd, base::PickleIterator iter) { |
665 if (HANDLE_EINTR(write(fd, &sandbox_flags_, sizeof(sandbox_flags_))) != | 666 if (HANDLE_EINTR(write(fd, &sandbox_flags_, sizeof(sandbox_flags_))) != |
666 sizeof(sandbox_flags_)) { | 667 sizeof(sandbox_flags_)) { |
667 PLOG(ERROR) << "write"; | 668 PLOG(ERROR) << "write"; |
668 } | 669 } |
669 | 670 |
670 return false; | 671 return false; |
671 } | 672 } |
672 | 673 |
673 } // namespace content | 674 } // namespace content |
OLD | NEW |