Cleaner fall-back stack capture for --enable-heap-profiling=native.

base/debug/stack_trace_unittest.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <stddef.h>
 
 #include <limits>
 #include <sstream>
 #include <string>
 
@@ skipping 236 matching lines @@
   EXPECT_EQ("00001", itoa_r_wrapper(1, 128, 10, 5));
   EXPECT_EQ("688", itoa_r_wrapper(0x688, 128, 16, 0));
   EXPECT_EQ("688", itoa_r_wrapper(0x688, 128, 16, 1));
   EXPECT_EQ("688", itoa_r_wrapper(0x688, 128, 16, 2));
   EXPECT_EQ("688", itoa_r_wrapper(0x688, 128, 16, 3));
   EXPECT_EQ("0688", itoa_r_wrapper(0x688, 128, 16, 4));
   EXPECT_EQ("00688", itoa_r_wrapper(0x688, 128, 16, 5));
 }
 #endif  // defined(OS_POSIX) && !defined(OS_ANDROID)
 
-#if HAVE_TRACE_STACK_FRAME_POINTERS && !defined(OS_WIN)
-// Windows x64 binaries cannot be built with frame pointer, and MSVC doesn't
-// provide intrinsics to query the frame pointer even for the x86 build, nor
-// does it allow us to take the address of labels, so skip these under Windows.
+#if HAVE_TRACE_STACK_FRAME_POINTERS()
+
 template <size_t Depth>
 void NOINLINE ExpectStackFramePointers(const void** frames,
                                        size_t max_depth) {
   code_start:
   // Calling __builtin_frame_address() forces compiler to emit
   // frame pointers, even if they are not enabled.
   EXPECT_NE(nullptr, __builtin_frame_address(0));
   ExpectStackFramePointers<Depth - 1>(frames, max_depth);
 
   constexpr size_t frame_index = Depth - 1;
@@ skipping 37 matching lines @@
 #if defined(OS_ANDROID) || defined(OS_MACOSX)
 #define MAYBE_StackEnd StackEnd
 #else
 #define MAYBE_StackEnd DISABLED_StackEnd
 #endif
 
 TEST_F(StackTraceTest, MAYBE_StackEnd) {
   EXPECT_NE(0u, GetStackEnd());
 }
 
-#endif  // HAVE_TRACE_STACK_FRAME_POINTERS && !defined(OS_WIN)
+#endif  // HAVE_TRACE_STACK_FRAME_POINTERS()
 
 }  // namespace debug
 }  // namespace base