Commit fb935ecd authored by Lei Zhang's avatar Lei Zhang Committed by Commit Bot

Simplify an ifdef in v8_unwinder_unittest.cc.

OS_IOS is never set in the chrome/ directory. Also fix lint errors.

Change-Id: I6f5f56ed6415b962737262ca15f30c36562177f9
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1816292Reviewed-by: default avatarCharlie Andrews <charliea@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
Cr-Commit-Position: refs/heads/master@{#698960}
parent d7743dbc
...@@ -6,6 +6,8 @@ ...@@ -6,6 +6,8 @@
#include <algorithm> #include <algorithm>
#include <memory> #include <memory>
#include <utility>
#include <vector>
#include "base/bind.h" #include "base/bind.h"
#include "base/callback.h" #include "base/callback.h"
...@@ -178,8 +180,7 @@ base::FunctionAddressRange CallThroughV8( ...@@ -178,8 +180,7 @@ base::FunctionAddressRange CallThroughV8(
// Checks that unwinding from C++ through JavaScript and back into C++ succeeds. // Checks that unwinding from C++ through JavaScript and back into C++ succeeds.
// NB: unwinding is only supported for 64 bit Windows and OS X. // NB: unwinding is only supported for 64 bit Windows and OS X.
#if (defined(OS_WIN) && defined(ARCH_CPU_64_BITS)) || \ #if (defined(OS_WIN) && defined(ARCH_CPU_64_BITS)) || defined(OS_MACOSX)
(defined(OS_MACOSX) && !defined(OS_IOS))
#define MAYBE_UnwindThroughV8Frames UnwindThroughV8Frames #define MAYBE_UnwindThroughV8Frames UnwindThroughV8Frames
#else #else
#define MAYBE_UnwindThroughV8Frames DISABLED_UnwindThroughV8Frames #define MAYBE_UnwindThroughV8Frames DISABLED_UnwindThroughV8Frames
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment