diff options
Diffstat (limited to 'chromium/tools/ipc_fuzzer')
6 files changed, 9 insertions, 13 deletions
diff --git a/chromium/tools/ipc_fuzzer/message_dump/message_dump.cc b/chromium/tools/ipc_fuzzer/message_dump/message_dump.cc index 3d570851f7c..247b3815c4b 100644 --- a/chromium/tools/ipc_fuzzer/message_dump/message_dump.cc +++ b/chromium/tools/ipc_fuzzer/message_dump/message_dump.cc @@ -10,7 +10,7 @@ #include "ipc/ipc_channel_proxy.h" #include "tools/ipc_fuzzer/message_lib/message_file.h" -#if defined(OS_WIN) +#if BUILDFLAG(IS_WIN) #define PidToStringType base::NumberToWString #define MESSAGE_DUMP_EXPORT __declspec(dllexport) #else diff --git a/chromium/tools/ipc_fuzzer/message_lib/BUILD.gn b/chromium/tools/ipc_fuzzer/message_lib/BUILD.gn index 458e5e6e0c5..00618d9f81c 100644 --- a/chromium/tools/ipc_fuzzer/message_lib/BUILD.gn +++ b/chromium/tools/ipc_fuzzer/message_lib/BUILD.gn @@ -12,7 +12,6 @@ static_library("ipc_message_lib") { "//base", "//chrome/common", "//chrome/common/safe_browsing:proto", - "//components/guest_view/common", "//components/nacl/common:buildflags", "//components/safe_browsing/core/common", "//components/spellcheck/common", diff --git a/chromium/tools/ipc_fuzzer/message_lib/DEPS b/chromium/tools/ipc_fuzzer/message_lib/DEPS index adb71217eaa..f29f4b2691a 100644 --- a/chromium/tools/ipc_fuzzer/message_lib/DEPS +++ b/chromium/tools/ipc_fuzzer/message_lib/DEPS @@ -1,7 +1,6 @@ include_rules = [ "+chrome/common", "+components/dns_prefetch/common", - "+components/guest_view/common", "+components/nacl/common", "+components/password_manager/content/common", "+components/spellcheck/common", diff --git a/chromium/tools/ipc_fuzzer/message_lib/all_messages.h b/chromium/tools/ipc_fuzzer/message_lib/all_messages.h index d005c67d7af..89210cc1950 100644 --- a/chromium/tools/ipc_fuzzer/message_lib/all_messages.h +++ b/chromium/tools/ipc_fuzzer/message_lib/all_messages.h @@ -21,7 +21,6 @@ #if BUILDFLAG(ENABLE_NACL) #include "components/nacl/common/nacl_host_messages.h" #endif -#include "components/guest_view/common/guest_view_message_generator.h" #include "content/common/all_messages.h" #include "extensions/common/extension_message_generator.h" #include "remoting/host/chromoting_messages.h" diff --git a/chromium/tools/ipc_fuzzer/message_replay/replay_process.cc b/chromium/tools/ipc_fuzzer/message_replay/replay_process.cc index de5be06e4a8..3ca860cf32b 100644 --- a/chromium/tools/ipc_fuzzer/message_replay/replay_process.cc +++ b/chromium/tools/ipc_fuzzer/message_replay/replay_process.cc @@ -7,12 +7,12 @@ #include <limits.h> #include <string> +#include <tuple> #include <utility> #include "base/bind.h" #include "base/command_line.h" #include "base/files/file_path.h" -#include "base/ignore_result.h" #include "base/logging.h" #include "base/message_loop/message_pump_type.h" #include "base/run_loop.h" @@ -34,7 +34,7 @@ #include "mojo/public/cpp/platform/platform_channel_endpoint.h" #include "mojo/public/cpp/system/invitation.h" -#if defined(OS_POSIX) +#if BUILDFLAG(IS_POSIX) #include "base/posix/global_descriptors.h" #include "content/public/common/content_descriptors.h" #endif @@ -49,7 +49,7 @@ class FakeChildProcessImpl : public content::mojom::ChildProcessInterceptorForTesting { public: FakeChildProcessImpl() { - ignore_result(disconnected_process_.BindNewPipeAndPassReceiver()); + std::ignore = disconnected_process_.BindNewPipeAndPassReceiver(); } // content::mojom::ChildProcessInterceptorForTesting overrides: @@ -71,10 +71,10 @@ void InitializeMojo() { mojo::IncomingInvitation InitializeMojoIPCChannel() { mojo::PlatformChannelEndpoint endpoint; -#if defined(OS_WIN) +#if BUILDFLAG(IS_WIN) endpoint = mojo::PlatformChannel::RecoverPassedEndpointFromCommandLine( *base::CommandLine::ForCurrentProcess()); -#elif defined(OS_POSIX) +#elif BUILDFLAG(IS_POSIX) endpoint = mojo::PlatformChannelEndpoint(mojo::PlatformHandle(base::ScopedFD( base::GlobalDescriptors::GetInstance()->Get(kMojoIPCChannel)))); #endif @@ -120,7 +120,7 @@ bool ReplayProcess::Initialize(int argc, const char** argv) { io_thread_.StartWithOptions( base::Thread::Options(base::MessagePumpType::IO, 0)); -#if defined(OS_POSIX) +#if BUILDFLAG(IS_POSIX) base::GlobalDescriptors* g_fds = base::GlobalDescriptors::GetInstance(); g_fds->Set(kMojoIPCChannel, kMojoIPCChannel + base::GlobalDescriptors::kBaseDescriptor); diff --git a/chromium/tools/ipc_fuzzer/message_tools/message_list.cc b/chromium/tools/ipc_fuzzer/message_tools/message_list.cc index 90b1a59a665..355ae404293 100644 --- a/chromium/tools/ipc_fuzzer/message_tools/message_list.cc +++ b/chromium/tools/ipc_fuzzer/message_tools/message_list.cc @@ -53,12 +53,11 @@ static bool check_msgtable() { exemptions.push_back(NaClMsgStart); #endif // !BUILDFLAG(ENABLE_NACL) - -#if !defined(OS_ANDROID) +#if !BUILDFLAG(IS_ANDROID) exemptions.push_back(EncryptedMediaMsgStart); exemptions.push_back(GinJavaBridgeMsgStart); exemptions.push_back(ExtensionWorkerMsgStart); -#endif // !defined(OS_ANDROID) +#endif // !BUILDFLAG(IS_ANDROID) for (size_t i = 0; i < MSGTABLE_SIZE; ++i) { int class_id = IPC_MESSAGE_ID_CLASS(msgtable[i].id); |