Add bits to indicate which parts of GPUInfo are collected.

gpu/config/gpu_info.cc

Index: gpu/config/gpu_info.cc
diff --git a/gpu/config/gpu_info.cc b/gpu/config/gpu_info.cc
index fd3d8a3fe573f7b5198bab5ddd884d1581c5d5a1..74510482f642910a42f520401d3d71b4576256b6 100644
--- a/gpu/config/gpu_info.cc
+++ b/gpu/config/gpu_info.cc
@@ -30,8 +30,7 @@ GPUInfo::GPUDevice::GPUDevice()
 GPUInfo::GPUDevice::~GPUDevice() { }
 
 GPUInfo::GPUInfo()
-    : finalized(false),
-      optimus(false),
+    : optimus(false),
       amd_switchable(false),
       lenovo_dcute(false),
       adapter_luid(0),
@@ -40,14 +39,20 @@ GPUInfo::GPUInfo()
       software_rendering(false),
       direct_rendering(true),
       sandboxed(false),
-      process_crash_count(0) {
+      process_crash_count(0),
+      basic_info_state(kCollectInfoNone),
+#if defined(OS_WIN)
+      context_info_state(kCollectInfoNone),
+      dx_diagnostics_info_state(kCollectInfoNone) {
+#else
+      context_info_state(kCollectInfoNone) {
+#endif
 }
 
 GPUInfo::~GPUInfo() { }
 
 void GPUInfo::EnumerateFields(Enumerator* enumerator) const {
   struct GPUInfoKnownFields {
-    bool finalized;
     base::TimeDelta initialization_time;
     bool optimus;
     bool amd_switchable;
@@ -77,7 +82,10 @@ void GPUInfo::EnumerateFields(Enumerator* enumerator) const {
     bool direct_rendering;
     bool sandboxed;
     int process_crash_count;
+    CollectInfoResult basic_info_state;
+    CollectInfoResult context_info_state;
 #if defined(OS_WIN)
+    CollectInfoResult dx_diagnostics_info_state;
     DxDiagNode dx_diagnostics;
 #endif
   };
@@ -98,7 +106,6 @@ void GPUInfo::EnumerateFields(Enumerator* enumerator) const {
   }
 
   enumerator->BeginAuxAttributes();
-  enumerator->AddBool("finalized", finalized);
   enumerator->AddTimeDeltaInSecondsF("initializationTime",
                                      initialization_time);
   enumerator->AddBool("optimus", optimus);
@@ -130,6 +137,11 @@ void GPUInfo::EnumerateFields(Enumerator* enumerator) const {
   enumerator->AddBool("directRendering", direct_rendering);
   enumerator->AddBool("sandboxed", sandboxed);
   enumerator->AddInt("processCrashCount", process_crash_count);
+  enumerator->AddInt("basicInfoState", basic_info_state);
+  enumerator->AddInt("contextInfoState", context_info_state);
+#if defined(OS_WIN)
+  enumerator->AddInt("DxDiagnosticsInfoState", dx_diagnostics_info_state);
+#endif
   // TODO(kbr): add dx_diagnostics on Windows.
   enumerator->EndAuxAttributes();
 }