Remove 'global' user-data in favor of 'process' user-data.

components/browser_watcher/postmortem_report_extractor.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 "components/browser_watcher/postmortem_report_extractor.h"
 
 #include <memory>
 #include <string>
 #include <utility>
 #include <vector>
@@ skipping 195 matching lines @@
 CollectionStatus Extract(const base::FilePath& stability_file,
                          StabilityReport* report) {
   DCHECK(report);
 
   // Create a global analyzer.
   std::unique_ptr<GlobalActivityAnalyzer> global_analyzer =
       GlobalActivityAnalyzer::CreateWithFile(stability_file);
   if (!global_analyzer)
     return ANALYZER_CREATION_FAILED;
 
-  // Early exit if there is no data.
-  std::vector<std::string> log_messages = global_analyzer->GetLogMessages();
-  ActivityUserData::Snapshot global_data_snapshot =
-      global_analyzer->GetGlobalDataSnapshot();
-
   // Extract data for only the first process.
   // TODO(manzagop): Extend this to all processes.
   int64_t pid = global_analyzer->GetFirstProcess();
+
+  // Early exit if there is no data.
+  std::vector<std::string> log_messages = global_analyzer->GetLogMessages();
+  ActivityUserData::Snapshot process_data_snapshot =
+      global_analyzer->GetProcessDataSnapshot(pid);
+
   ThreadActivityAnalyzer* thread_analyzer =
       global_analyzer->GetFirstAnalyzer(pid);
-  if (log_messages.empty() && global_data_snapshot.empty() &&
+  if (log_messages.empty() && process_data_snapshot.empty() &&
       !thread_analyzer) {
     return DEBUG_FILE_NO_DATA;
   }
 
   // Collect log messages.
   for (const std::string& message : log_messages) {
     report->add_log_messages(message);
   }
 
   // Collect global user data.
   google::protobuf::Map<std::string, TypedValue>& global_data =
       *(report->mutable_global_data());
-  CollectUserData(global_data_snapshot, &global_data, report);
+  CollectUserData(process_data_snapshot, &global_data, report);
 
   // Collect thread activity data.
   // Note: a single process is instrumented.
   ProcessState* process_state = report->add_process_states();
   for (; thread_analyzer != nullptr;
        thread_analyzer = global_analyzer->GetNextAnalyzer()) {
     // Only valid analyzers are expected per contract of GetFirstAnalyzer /
     // GetNextAnalyzer.
     DCHECK(thread_analyzer->IsValid());
 
     if (!process_state->has_process_id()) {
       process_state->set_process_id(
           thread_analyzer->activity_snapshot().process_id);
     }
     DCHECK_EQ(thread_analyzer->activity_snapshot().process_id,
               process_state->process_id());
 
     ThreadState* thread_state = process_state->add_threads();
     CollectThread(thread_analyzer->activity_snapshot(), thread_state);
   }
 
   // Collect module information.
   CollectModuleInformation(global_analyzer->GetModules(), process_state);
 
   return SUCCESS;
 }
 
 }  // namespace browser_watcher