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

Side by Side Diff: content/zygote/zygote_main_linux.cc

Issue 2082473002: Move third_party/libjingle/overrides to third_party/webrtc_overrides (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 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
« no previous file with comments | « content/renderer/renderer_main.cc ('k') | jingle/glue/DEPS » ('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) 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_main.h" 5 #include "content/zygote/zygote_main.h"
6 6
7 #include <dlfcn.h> 7 #include <dlfcn.h>
8 #include <fcntl.h> 8 #include <fcntl.h>
9 #include <openssl/crypto.h> 9 #include <openssl/crypto.h>
10 #include <openssl/rand.h> 10 #include <openssl/rand.h>
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 #if defined(OS_LINUX) 57 #if defined(OS_LINUX)
58 #include <sys/prctl.h> 58 #include <sys/prctl.h>
59 #endif 59 #endif
60 60
61 #if defined(ENABLE_PLUGINS) 61 #if defined(ENABLE_PLUGINS)
62 #include "content/common/pepper_plugin_list.h" 62 #include "content/common/pepper_plugin_list.h"
63 #include "content/public/common/pepper_plugin_info.h" 63 #include "content/public/common/pepper_plugin_info.h"
64 #endif 64 #endif
65 65
66 #if defined(ENABLE_WEBRTC) 66 #if defined(ENABLE_WEBRTC)
67 #include "third_party/libjingle/overrides/init_webrtc.h" 67 #include "third_party/webrtc_overrides/init_webrtc.h"
68 #endif 68 #endif
69 69
70 #if defined(SANITIZER_COVERAGE) 70 #if defined(SANITIZER_COVERAGE)
71 #include <sanitizer/common_interface_defs.h> 71 #include <sanitizer/common_interface_defs.h>
72 #include <sanitizer/coverage_interface.h> 72 #include <sanitizer/coverage_interface.h>
73 #endif 73 #endif
74 74
75 namespace content { 75 namespace content {
76 76
77 namespace { 77 namespace {
(...skipping 565 matching lines...) Expand 10 before | Expand all | Expand 10 after
643 const bool namespace_sandbox_engaged = sandbox_flags & kSandboxLinuxUserNS; 643 const bool namespace_sandbox_engaged = sandbox_flags & kSandboxLinuxUserNS;
644 CHECK_EQ(using_namespace_sandbox, namespace_sandbox_engaged); 644 CHECK_EQ(using_namespace_sandbox, namespace_sandbox_engaged);
645 645
646 Zygote zygote(sandbox_flags, std::move(fork_delegates), extra_children, 646 Zygote zygote(sandbox_flags, std::move(fork_delegates), extra_children,
647 extra_fds); 647 extra_fds);
648 // This function call can return multiple times, once per fork(). 648 // This function call can return multiple times, once per fork().
649 return zygote.ProcessRequests(); 649 return zygote.ProcessRequests();
650 } 650 }
651 651
652 } // namespace content 652 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/renderer_main.cc ('k') | jingle/glue/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698