StabilityReport proto changes for multi-process support

components/browser_watcher/stability_report_extractor_unittest.cc

 // Copyright 2017 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 "components/browser_watcher/stability_report_extractor.h"
 
 #include <memory>
 #include <utility>
 
 #include "base/debug/activity_tracker.h"
@@ skipping 323 matching lines @@
   process_data.SetInt("int", -9999);
   process_data.SetUint("uint", 9999);
   process_data.SetBool("bool", true);
   process_data.SetReference("ref", string1, strlen(string1));
   process_data.SetStringReference("sref", string2);
 
   // Collect the stability report.
   StabilityReport report;
   ASSERT_EQ(SUCCESS, Extract(debug_file_path(), &report));
 
-  // Validate the report's user data.
-  const auto& collected_data = report.global_data();
+  // We expect a single process.
+  ASSERT_EQ(1, report.process_states_size());
+
+  // Validate the report contains the process' data.
+  const auto& collected_data = report.process_states(0).data();
   ASSERT_EQ(kInternalProcessDatums + 8U, collected_data.size());
 
   ASSERT_TRUE(base::ContainsKey(collected_data, "raw"));
   EXPECT_EQ(TypedValue::kBytesValue, collected_data.at("raw").value_case());
   EXPECT_EQ("foo", collected_data.at("raw").bytes_value());
 
   ASSERT_TRUE(base::ContainsKey(collected_data, "string"));
   EXPECT_EQ(TypedValue::kStringValue, collected_data.at("string").value_case());
   EXPECT_EQ("bar", collected_data.at("string").string_value());
 
@@ skipping 33 matching lines @@
   GlobalActivityTracker::CreateWithFile(debug_file_path(), kMemorySize, 0ULL,
                                         "", 3);
   ActivityUserData& process_data = GlobalActivityTracker::Get()->process_data();
   process_data.SetString("string", "bar");
   process_data.SetString("FieldTrial.string", "bar");
   process_data.SetString("FieldTrial.foo", "bar");
 
   // Collect the stability report.
   StabilityReport report;
   ASSERT_EQ(SUCCESS, Extract(debug_file_path(), &report));
+  ASSERT_EQ(1, report.process_states_size());
 
   // Validate the report's experiment and global data.
   ASSERT_EQ(2, report.field_trials_size());
   EXPECT_NE(0U, report.field_trials(0).name_id());
   EXPECT_NE(0U, report.field_trials(0).group_id());
   EXPECT_NE(0U, report.field_trials(1).name_id());
   EXPECT_EQ(report.field_trials(0).group_id(),
             report.field_trials(1).group_id());
 
   // Expect 1 key/value pair.
-  const auto& collected_data = report.global_data();
+  const auto& collected_data = report.process_states(0).data();
   EXPECT_EQ(kInternalProcessDatums + 1U, collected_data.size());
   EXPECT_TRUE(base::ContainsKey(collected_data, "string"));
 }
 
 TEST_F(StabilityReportExtractorTest, ModuleCollection) {
   // Record some module information.
   GlobalActivityTracker::CreateWithFile(debug_file_path(), kMemorySize, 0ULL,
                                         "", 3);
 
   base::debug::GlobalActivityTracker::ModuleInfo module_info = {};
@@ skipping 28 matching lines @@
   EXPECT_EQ("CAFECAFE2d000", collected_module.code_identifier());
   EXPECT_EQ(module_info.debug_file, collected_module.debug_file());
   EXPECT_EQ("1122334455667788ABCD0123456789AB1",
             collected_module.debug_identifier());
   EXPECT_EQ("", collected_module.version());
   EXPECT_EQ(0LL, collected_module.shrink_down_delta());
   EXPECT_EQ(!module_info.is_loaded, collected_module.is_unloaded());
 }
 
 }  // namespace browser_watcher