StabilityReport proto changes for multi-process support

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 352 matching lines @@
   ASSERT_TRUE(ContainsKey(snapshot, "ref"));
   EXPECT_EQ(string1, snapshot.at("ref").GetReference().data());
   EXPECT_EQ(sizeof(string1), snapshot.at("ref").GetReference().size());
   ASSERT_TRUE(ContainsKey(snapshot, "sref"));
   EXPECT_EQ(string2, snapshot.at("sref").GetStringReference().data());
   EXPECT_EQ(strlen(string2), snapshot.at("sref").GetStringReference().size());
 }
 
 TEST_F(ActivityAnalyzerTest, GlobalModulesTest) {
   GlobalActivityTracker::CreateWithLocalMemory(kMemorySize, 0, "", 3, 0);
+  GlobalActivityTracker* global = GlobalActivityTracker::Get();
 
-  PersistentMemoryAllocator* allocator =
-      GlobalActivityTracker::Get()->allocator();
+  PersistentMemoryAllocator* allocator = global->allocator();
   GlobalActivityAnalyzer global_analyzer(
       std::make_unique<PersistentMemoryAllocator>(
           const_cast<void*>(allocator->data()), allocator->size(), 0, 0, "",
           true));
 
   GlobalActivityTracker::ModuleInfo info1;
   info1.is_loaded = true;
   info1.address = 0x12345678;
   info1.load_time = 1111;
   info1.size = 0xABCDEF;
   info1.timestamp = 111;
   info1.age = 11;
   info1.identifier[0] = 1;
   info1.file = "anything";
   info1.debug_file = "elsewhere";
 
-  GlobalActivityTracker::Get()->RecordModuleInfo(info1);
+  global->RecordModuleInfo(info1);
   std::vector<GlobalActivityTracker::ModuleInfo> modules1;
-  modules1 = global_analyzer.GetModules();
+  modules1 = global_analyzer.GetModules(global_analyzer.GetFirstProcess());
   ASSERT_EQ(1U, modules1.size());
   GlobalActivityTracker::ModuleInfo& stored1a = modules1[0];
   EXPECT_EQ(info1.is_loaded, stored1a.is_loaded);
   EXPECT_EQ(info1.address, stored1a.address);
   EXPECT_NE(info1.load_time, stored1a.load_time);
   EXPECT_EQ(info1.size, stored1a.size);
   EXPECT_EQ(info1.timestamp, stored1a.timestamp);
   EXPECT_EQ(info1.age, stored1a.age);
   EXPECT_EQ(info1.identifier[0], stored1a.identifier[0]);
   EXPECT_EQ(info1.file, stored1a.file);
   EXPECT_EQ(info1.debug_file, stored1a.debug_file);
 
   info1.is_loaded = false;
-  GlobalActivityTracker::Get()->RecordModuleInfo(info1);
-  modules1 = global_analyzer.GetModules();
+  global->RecordModuleInfo(info1);
+  modules1 = global_analyzer.GetModules(global_analyzer.GetFirstProcess());
   ASSERT_EQ(1U, modules1.size());
   GlobalActivityTracker::ModuleInfo& stored1b = modules1[0];
   EXPECT_EQ(info1.is_loaded, stored1b.is_loaded);
   EXPECT_EQ(info1.address, stored1b.address);
   EXPECT_NE(info1.load_time, stored1b.load_time);
   EXPECT_EQ(info1.size, stored1b.size);
   EXPECT_EQ(info1.timestamp, stored1b.timestamp);
   EXPECT_EQ(info1.age, stored1b.age);
   EXPECT_EQ(info1.identifier[0], stored1b.identifier[0]);
   EXPECT_EQ(info1.file, stored1b.file);
   EXPECT_EQ(info1.debug_file, stored1b.debug_file);
 
   GlobalActivityTracker::ModuleInfo info2;
   info2.is_loaded = true;
   info2.address = 0x87654321;
   info2.load_time = 2222;
   info2.size = 0xFEDCBA;
   info2.timestamp = 222;
   info2.age = 22;
   info2.identifier[0] = 2;
   info2.file = "nothing";
   info2.debug_file = "farewell";
 
-  GlobalActivityTracker::Get()->RecordModuleInfo(info2);
+  global->RecordModuleInfo(info2);
   std::vector<GlobalActivityTracker::ModuleInfo> modules2;
-  modules2 = global_analyzer.GetModules();
+  modules2 = global_analyzer.GetModules(global_analyzer.GetFirstProcess());
   ASSERT_EQ(2U, modules2.size());
   GlobalActivityTracker::ModuleInfo& stored2 = modules2[1];
   EXPECT_EQ(info2.is_loaded, stored2.is_loaded);
   EXPECT_EQ(info2.address, stored2.address);
   EXPECT_NE(info2.load_time, stored2.load_time);
   EXPECT_EQ(info2.size, stored2.size);
   EXPECT_EQ(info2.timestamp, stored2.timestamp);
   EXPECT_EQ(info2.age, stored2.age);
   EXPECT_EQ(info2.identifier[0], stored2.identifier[0]);
   EXPECT_EQ(info2.file, stored2.file);
@@ skipping 62 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