Added support for storing arbitrary user data.

base/debug/activity_analyzer_unittest.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_analyzer.h"
 
 #include <atomic>
 #include <memory>
 
 #include "base/bind.h"
@@ skipping 28 matching lines @@
 
  private:
   std::unique_ptr<char[]> mem_segment_;
 };
 
 }  // namespace
 
 
 class ActivityAnalyzerTest : public testing::Test {
  public:
-  const int kMemorySize = 1 << 10;  // 1MiB
+  const int kMemorySize = 1 << 20;  // 1MiB
   const int kStackSize  = 1 << 10;  // 1KiB
 
   ActivityAnalyzerTest() {}
 
   ~ActivityAnalyzerTest() override {
     GlobalActivityTracker* global_tracker = GlobalActivityTracker::Get();
     if (global_tracker) {
       global_tracker->ReleaseTrackerForCurrentThreadForTesting();
       delete global_tracker;
     }
@@ skipping 31 matching lines @@
         source_(source),
         activity_(activity),
         data_(data),
         ready_(false),
         exit_(false),
         exit_condition_(&lock_) {}
 
   ~SimpleActivityThread() override {}
 
   void Run() override {
-    GlobalActivityTracker::Get()
+    ThreadActivityTracker::ActivityId id = GlobalActivityTracker::Get()
         ->GetOrCreateTrackerForCurrentThread()
         ->PushActivity(source_, activity_, data_);
 
     {
       AutoLock auto_lock(lock_);
       ready_.store(true, std::memory_order_release);
       while (!exit_.load(std::memory_order_relaxed))
         exit_condition_.Wait();
     }
 
     GlobalActivityTracker::Get()
-        ->GetOrCreateTrackerForCurrentThread()
-        ->PopActivity();
+        ->GetTrackerForCurrentThread()
+        ->PopActivity(id);
   }
 
   void Exit() {
     AutoLock auto_lock(lock_);
     exit_.store(true, std::memory_order_relaxed);
     exit_condition_.Signal();
   }
 
   void WaitReady() {
     SPIN_FOR_1_SECOND_OR_UNTIL_TRUE(ready_.load(std::memory_order_acquire));
@@ skipping 47 matching lines @@
   ThreadActivityAnalyzer* ta2 = analyzer.GetFirstAnalyzer();
   ASSERT_TRUE(ta2);
   EXPECT_FALSE(analyzer.GetNextAnalyzer());
   ThreadActivityAnalyzer::ThreadKey tk2 = ta2->GetThreadKey();
   EXPECT_EQ(ta2, analyzer.GetAnalyzerForThread(tk2));
   EXPECT_EQ(tk1, tk2);
 }
 
 }  // namespace debug
 }  // namespace base