Remove 'global' user-data in favor of 'process' 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/auto_reset.h"
@@ skipping 296 matching lines @@
     EXPECT_EQ(string1b, user_data.at("sref1").GetStringReference().data());
     EXPECT_EQ(strlen(string1b),
               user_data.at("sref1").GetStringReference().size());
   }
 
   ASSERT_TRUE(tracker->CreateSnapshot(&tracker_snapshot));
   ASSERT_EQ(0U, tracker_snapshot.activity_stack.size());
 }
 
 TEST_F(ActivityAnalyzerTest, GlobalUserDataTest) {
+  const int64_t pid = GetCurrentProcId();
   GlobalActivityTracker::CreateWithLocalMemory(kMemorySize, 0, "", 3, 0);
 
   const char string1[] = "foo";
   const char string2[] = "bar";
 
   PersistentMemoryAllocator* allocator =
       GlobalActivityTracker::Get()->allocator();
   GlobalActivityAnalyzer global_analyzer(MakeUnique<PersistentMemoryAllocator>(
       const_cast<void*>(allocator->data()), allocator->size(), 0, 0, "", true));
 
-  ActivityUserData& global_data = GlobalActivityTracker::Get()->global_data();
-  global_data.Set("raw", "foo", 3);
-  global_data.SetString("string", "bar");
-  global_data.SetChar("char", '9');
-  global_data.SetInt("int", -9999);
-  global_data.SetUint("uint", 9999);
-  global_data.SetBool("bool", true);
-  global_data.SetReference("ref", string1, sizeof(string1));
-  global_data.SetStringReference("sref", string2);
+  ActivityUserData& process_data = GlobalActivityTracker::Get()->process_data();
+  ASSERT_NE(0U, process_data.id());
+  process_data.Set("raw", "foo", 3);
+  process_data.SetString("string", "bar");
+  process_data.SetChar("char", '9');
+  process_data.SetInt("int", -9999);
+  process_data.SetUint("uint", 9999);
+  process_data.SetBool("bool", true);
+  process_data.SetReference("ref", string1, sizeof(string1));
+  process_data.SetStringReference("sref", string2);
 
+  int64_t first_pid = global_analyzer.GetFirstProcess();
+  DCHECK_EQ(pid, first_pid);
   const ActivityUserData::Snapshot& snapshot =
-      global_analyzer.GetGlobalDataSnapshot();
+      global_analyzer.GetProcessDataSnapshot(pid);
   ASSERT_TRUE(ContainsKey(snapshot, "raw"));
   EXPECT_EQ("foo", snapshot.at("raw").Get().as_string());
   ASSERT_TRUE(ContainsKey(snapshot, "string"));
   EXPECT_EQ("bar", snapshot.at("string").GetString().as_string());
   ASSERT_TRUE(ContainsKey(snapshot, "char"));
   EXPECT_EQ('9', snapshot.at("char").GetChar());
   ASSERT_TRUE(ContainsKey(snapshot, "int"));
   EXPECT_EQ(-9999, snapshot.at("int").GetInt());
   ASSERT_TRUE(ContainsKey(snapshot, "uint"));
   EXPECT_EQ(9999U, snapshot.at("uint").GetUint());
@@ skipping 145 matching lines @@
   const ActivityUserData::Snapshot& pdata1 =
       analyzer.GetProcessDataSnapshot(pid1);
   const ActivityUserData::Snapshot& pdata2 =
       analyzer.GetProcessDataSnapshot(pid2);
   EXPECT_EQ(1001, pdata1.at("pid").GetInt());
   EXPECT_EQ(2002, pdata2.at("pid").GetInt());
 }
 
 }  // namespace debug
 }  // namespace base