2 files changed, 9 insertions, 20 deletions

diff --git a/base/trace_event/heap_profiler_allocation_context_tracker.cc b/base/trace_event/heap_profiler_allocation_context_tracker.cc
index b58fb60..51e4590 100644
--- a/base/trace_event/heap_profiler_allocation_context_tracker.cc
+++ b/base/trace_event/heap_profiler_allocation_context_tracker.cc
@@ -5,6 +5,7 @@
 #include "base/trace_event/heap_profiler_allocation_context_tracker.h"
 
 #include <algorithm>
+#include <iterator>
 
 #include "base/atomicops.h"
 #include "base/threading/thread_local_storage.h"
@@ -25,13 +26,6 @@ void DestructAllocationContextTracker(void* alloc_ctx_tracker) {
   delete static_cast<AllocationContextTracker*>(alloc_ctx_tracker);
 }
 
-// Returns a pointer past the end of the fixed-size array |array| of |T| of
-// length |N|, identical to C++11 |std::end|.
-template <typename T, int N>
-T* End(T(&array)[N]) {
-  return array + N;
-}
-
 }  // namespace
 
 AllocationContextTracker::AllocationContextTracker() {}
@@ -99,9 +93,9 @@ AllocationContext AllocationContextTracker::GetContextSnapshot() {
   // Fill the backtrace.
   {
     auto src = tracker->pseudo_stack_.begin();
-    auto dst = ctx.backtrace.frames;
+    auto dst = std::begin(ctx.backtrace.frames);
     auto src_end = tracker->pseudo_stack_.end();
-    auto dst_end = End(ctx.backtrace.frames);
+    auto dst_end = std::end(ctx.backtrace.frames);
 
     // Copy as much of the bottom of the pseudo stack into the backtrace as
     // possible.
diff --git a/base/trace_event/heap_profiler_allocation_context_tracker_unittest.cc b/base/trace_event/heap_profiler_allocation_context_tracker_unittest.cc
index fe3f407..130a927 100644
--- a/base/trace_event/heap_profiler_allocation_context_tracker_unittest.cc
+++ b/base/trace_event/heap_profiler_allocation_context_tracker_unittest.cc
@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <iterator>
+
 #include "base/memory/ref_counted.h"
 #include "base/trace_event/heap_profiler_allocation_context.h"
 #include "base/trace_event/heap_profiler_allocation_context_tracker.h"
@@ -19,23 +21,16 @@ const char kEclair[] = "Eclair";
 const char kFroyo[] = "Froyo";
 const char kGingerbread[] = "Gingerbread";
 
-// Returns a pointer past the end of the fixed-size array |array| of |T| of
-// length |N|, identical to C++11 |std::end|.
-template <typename T, int N>
-const T* End(const T(&array)[N]) {
-  return array + N;
-}
-
 // Asserts that the fixed-size array |expected_backtrace| matches the backtrace
 // in |AllocationContextTracker::GetContextSnapshot|.
 template <size_t N>
 void AssertBacktraceEquals(const StackFrame(&expected_backtrace)[N]) {
   AllocationContext ctx = AllocationContextTracker::GetContextSnapshot();
 
-  auto actual = ctx.backtrace.frames;
-  auto actual_bottom = End(ctx.backtrace.frames);
-  auto expected = expected_backtrace;
-  auto expected_bottom = End(expected_backtrace);
+  auto actual = std::begin(ctx.backtrace.frames);
+  auto actual_bottom = std::end(ctx.backtrace.frames);
+  auto expected = std::begin(expected_backtrace);
+  auto expected_bottom = std::end(expected_backtrace);
 
   // Note that this requires the pointers to be equal, this is not doing a deep
   // string comparison.