diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-03-08 10:28:10 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-03-20 13:40:30 +0000 |
| commit | e733310db58160074f574c429d48f8308c0afe17 (patch) | |
| tree | f8aef4b7e62a69928dbcf880620eece20f98c6df /chromium/content/zygote | |
| parent | 2f583e4aec1ae3a86fa047829c96b310dc12ecdf (diff) | |
| download | qtwebengine-chromium-e733310db58160074f574c429d48f8308c0afe17.tar.gz | |
BASELINE: Update Chromium to 56.0.2924.122
Change-Id: I4e04de8f47e47e501c46ed934c76a431c6337ced
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/content/zygote')
| -rw-r--r-- | chromium/content/zygote/zygote_linux.cc | 2 | ||||
| -rw-r--r-- | chromium/content/zygote/zygote_main_linux.cc | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/chromium/content/zygote/zygote_linux.cc b/chromium/content/zygote/zygote_linux.cc index 59d9313554e..c196a7fc2fa 100644 --- a/chromium/content/zygote/zygote_linux.cc +++ b/chromium/content/zygote/zygote_linux.cc @@ -435,8 +435,6 @@ int Zygote::ForkWithRealPid(const std::string& process_type, DLOG(ERROR) << "Failed to find kMojoIPCChannel in FD mapping"; return -1; } - int ipc_channel_fd = LookUpFd(fd_mapping, kPrimaryIPCChannel); - DCHECK_EQ(-1, ipc_channel_fd); std::vector<int> fds; fds.push_back(mojo_channel_fd); // kBrowserFDIndex fds.push_back(pid_oracle.get()); // kPIDOracleFDIndex diff --git a/chromium/content/zygote/zygote_main_linux.cc b/chromium/content/zygote/zygote_main_linux.cc index 6cc0f599d6b..40260cd208b 100644 --- a/chromium/content/zygote/zygote_main_linux.cc +++ b/chromium/content/zygote/zygote_main_linux.cc @@ -6,8 +6,6 @@ #include <dlfcn.h> #include <fcntl.h> -#include <openssl/crypto.h> -#include <openssl/rand.h> #include <pthread.h> #include <signal.h> #include <stddef.h> @@ -52,6 +50,8 @@ #include "sandbox/linux/services/thread_helpers.h" #include "sandbox/linux/suid/client/setuid_sandbox_client.h" #include "third_party/WebKit/public/web/linux/WebFontRendering.h" +#include "third_party/boringssl/src/include/openssl/crypto.h" +#include "third_party/boringssl/src/include/openssl/rand.h" #include "third_party/icu/source/i18n/unicode/timezone.h" #include "third_party/skia/include/ports/SkFontConfigInterface.h" #include "third_party/skia/include/ports/SkFontMgr_android.h" |