Carry the client ID from the database all the way through upload

minidump/minidump_crashpad_info_writer.cc

 // Copyright 2014 The Crashpad Authors. All rights reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
 //     http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
@@ skipping 20 matching lines @@
 }
 
 MinidumpCrashpadInfoWriter::~MinidumpCrashpadInfoWriter() {
 }
 
 void MinidumpCrashpadInfoWriter::InitializeFromSnapshot(
     const ProcessSnapshot* process_snapshot) {
   DCHECK_EQ(state(), kStateMutable);
   DCHECK(!module_list_);
 
+  UUID client_id;
+  process_snapshot->ClientID(&client_id);
+  SetClientID(client_id);
+
   auto simple_annotations =
       make_scoped_ptr(new MinidumpSimpleStringDictionaryWriter());
   simple_annotations->InitializeFromMap(
       process_snapshot->AnnotationsSimpleMap());
   if (simple_annotations->IsUseful()) {
     SetSimpleAnnotations(simple_annotations.Pass());
   }
 
   auto modules = make_scoped_ptr(new MinidumpModuleCrashpadInfoListWriter());
   modules->InitializeFromSnapshot(process_snapshot->Modules());
 
   if (modules->IsUseful()) {
     SetModuleList(modules.Pass());
   }
 }
 
+void MinidumpCrashpadInfoWriter::SetClientID(const UUID& client_id) {
+  DCHECK_EQ(state(), kStateMutable);
+
+  crashpad_info_.client_id = client_id;
+}
+
 void MinidumpCrashpadInfoWriter::SetSimpleAnnotations(
     scoped_ptr<MinidumpSimpleStringDictionaryWriter> simple_annotations) {
   DCHECK_EQ(state(), kStateMutable);
 
   simple_annotations_ = simple_annotations.Pass();
 }
 
 void MinidumpCrashpadInfoWriter::SetModuleList(
     scoped_ptr<MinidumpModuleCrashpadInfoListWriter> module_list) {
   DCHECK_EQ(state(), kStateMutable);
@@ skipping 44 matching lines @@
   DCHECK_EQ(state(), kStateWritable);
 
   return file_writer->Write(&crashpad_info_, sizeof(crashpad_info_));
 }
 
 MinidumpStreamType MinidumpCrashpadInfoWriter::StreamType() const {
   return kMinidumpStreamTypeCrashpadInfo;
 }
 
 bool MinidumpCrashpadInfoWriter::IsUseful() const {
-  return simple_annotations_ || module_list_;
+  return crashpad_info_.client_id != UUID() ||
+         simple_annotations_ ||
+         module_list_;
 }
 
 }  // namespace crashpad