Improved support for objects inside persistent memory.

base/debug/activity_tracker.cc

 // Copyright 2016 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 "base/debug/activity_tracker.h"
 
 #include <algorithm>
 
 #include "base/debug/stack_trace.h"
 #include "base/files/file.h"
@@ skipping 1003 matching lines @@
   // Convert the memory block found above into an actual memory address.
   // Doing the conversion as a Header object enacts the 32/64-bit size
   // consistency checks which would not otherwise be done. Unfortunately,
   // some older compilers and MSVC don't have standard-conforming definitions
   // of std::atomic which cause it not to be plain-old-data. Don't check on
   // those platforms assuming that the checks on other platforms will be
   // sufficient.
   // TODO(bcwhite): Review this after major compiler releases.
   DCHECK(mem_reference);
   void* mem_base;
-#if !defined(OS_WIN) && !defined(OS_ANDROID)
+#if 0  // TODO(bcwhite): Update this for new GetAsObject functionality.
   mem_base = allocator_->GetAsObject<ThreadActivityTracker::Header>(
       mem_reference, kTypeIdActivityTracker);
 #else
   mem_base = allocator_->GetAsArray<char>(mem_reference, kTypeIdActivityTracker,
                                           PersistentMemoryAllocator::kSizeAny);
 #endif
 
   DCHECK(mem_base);
   DCHECK_LE(stack_memory_size_, allocator_->GetAllocSize(mem_reference));
 
@@ skipping 174 matching lines @@
     : GlobalActivityTracker::ScopedThreadActivity(
           program_counter,
           nullptr,
           Activity::ACT_PROCESS_WAIT,
           ActivityData::ForProcess(process->Pid()),
           /*lock_allowed=*/true) {}
 #endif
 
 }  // namespace debug
 }  // namespace base