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/tools/ipc_fuzzer | |
| 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/tools/ipc_fuzzer')
4 files changed, 4 insertions, 17 deletions
diff --git a/chromium/tools/ipc_fuzzer/fuzzer/fuzzer.cc b/chromium/tools/ipc_fuzzer/fuzzer/fuzzer.cc index ad02ffc79d6..643cda50129 100644 --- a/chromium/tools/ipc_fuzzer/fuzzer/fuzzer.cc +++ b/chromium/tools/ipc_fuzzer/fuzzer/fuzzer.cc @@ -1334,16 +1334,7 @@ struct FuzzTraits<IPC::ChannelHandle> { if (!fuzzer->ShouldGenerate()) return true; - // TODO(inferno): Add way to generate real channel handles. -#if defined(OS_WIN) - HANDLE fake_handle = (HANDLE)(RandU64()); - p->pipe = IPC::ChannelHandle::PipeHandle(fake_handle); - return true; -#elif defined(OS_POSIX) - return - FuzzParam(&p->name, fuzzer) && - FuzzParam(&p->socket, fuzzer); -#endif + return FuzzParam(&p->mojo_handle, fuzzer); } }; @@ -1685,9 +1676,9 @@ struct FuzzTraits<ppapi::SocketOptionData> { template <> struct FuzzTraits<printing::PdfRenderSettings> { static bool Fuzz(printing::PdfRenderSettings* p, Fuzzer* fuzzer) { - gfx::Rect area = p->area(); - int dpi = p->dpi(); - bool autorotate = p->autorotate(); + gfx::Rect area = p->area; + int dpi = p->dpi; + bool autorotate = p->autorotate; if (!FuzzParam(&area, fuzzer)) return false; if (!FuzzParam(&dpi, fuzzer)) diff --git a/chromium/tools/ipc_fuzzer/message_lib/DEPS b/chromium/tools/ipc_fuzzer/message_lib/DEPS index 694808414f9..fb8db09c145 100644 --- a/chromium/tools/ipc_fuzzer/message_lib/DEPS +++ b/chromium/tools/ipc_fuzzer/message_lib/DEPS @@ -1,6 +1,5 @@ include_rules = [ "+chrome/common", - "+components/autofill/content/common", "+components/dns_prefetch/common", "+components/nacl/common", "+components/network_hints/common", diff --git a/chromium/tools/ipc_fuzzer/message_lib/all_messages.h b/chromium/tools/ipc_fuzzer/message_lib/all_messages.h index c356680697a..ba130c0efac 100644 --- a/chromium/tools/ipc_fuzzer/message_lib/all_messages.h +++ b/chromium/tools/ipc_fuzzer/message_lib/all_messages.h @@ -15,7 +15,6 @@ #undef CONTENT_PUBLIC_COMMON_COMMON_PARAM_TRAITS_MACROS_H_ #include "chrome/common/all_messages.h" -#include "components/autofill/content/common/autofill_message_generator.h" #if !defined(DISABLE_NACL) #include "components/nacl/common/nacl_host_messages.h" #endif diff --git a/chromium/tools/ipc_fuzzer/message_replay/replay_process.cc b/chromium/tools/ipc_fuzzer/message_replay/replay_process.cc index 1d79cc90119..c14d7d837cd 100644 --- a/chromium/tools/ipc_fuzzer/message_replay/replay_process.cc +++ b/chromium/tools/ipc_fuzzer/message_replay/replay_process.cc @@ -88,8 +88,6 @@ bool ReplayProcess::Initialize(int argc, const char** argv) { #if defined(OS_POSIX) base::GlobalDescriptors* g_fds = base::GlobalDescriptors::GetInstance(); - g_fds->Set(kPrimaryIPCChannel, - kPrimaryIPCChannel + base::GlobalDescriptors::kBaseDescriptor); g_fds->Set(kMojoIPCChannel, kMojoIPCChannel + base::GlobalDescriptors::kBaseDescriptor); #endif |