Added support for storing arbitrary user data.

base/debug/activity_analyzer_unittest.cc

Index: base/debug/activity_analyzer_unittest.cc
diff --git a/base/debug/activity_analyzer_unittest.cc b/base/debug/activity_analyzer_unittest.cc
index 7333656b72f5f0c5da0ec30538b968ea5dcd7d00..a179674663823f1b3a46933d3a0f72a51d292286 100644
--- a/base/debug/activity_analyzer_unittest.cc
+++ b/base/debug/activity_analyzer_unittest.cc
@@ -46,7 +46,7 @@ class TestActivityTracker : public ThreadActivityTracker {
 
 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() {}
@@ -98,7 +98,7 @@ class SimpleActivityThread : public SimpleThread {
   ~SimpleActivityThread() override {}
 
   void Run() override {
-    GlobalActivityTracker::Get()
+    ThreadActivityTracker::ActivityId id = GlobalActivityTracker::Get()
         ->GetOrCreateTrackerForCurrentThread()
         ->PushActivity(source_, activity_, data_);
 
@@ -110,8 +110,8 @@ class SimpleActivityThread : public SimpleThread {
     }
 
     GlobalActivityTracker::Get()
-        ->GetOrCreateTrackerForCurrentThread()
-        ->PopActivity();
+        ->GetTrackerForCurrentThread()
+        ->PopActivity(id);
   }
 
   void Exit() {