DeviceStatusCollector: fix logic in parsing telemetry probe

Move a brace so that telemetry logic is properly parsed. Previously
multiple telemetry items were only parsed it the battery information is
present.

Bug: none
Change-Id: I0cea4e12c9a8c504bde11917aefd4d0548b77800
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2153694
Commit-Queue: Trent Begin <tbegin@chromium.org>
Reviewed-by: Maksim Ivanov <emaxx@chromium.org>
Reviewed-by: Jesse Schettler <jschettler@chromium.org>
Cr-Commit-Position: refs/heads/master@{#762031}

chrome/browser/chromeos/policy/status_collector/device_status_collector.cc

@@ -892,6 +892,13 @@ class DeviceStatusCollectorState : public StatusCollectorState {
       if (!smart_info.is_null())
         battery_info_out->set_manufacture_date(smart_info->manufacture_date);
 
+      for (const std::unique_ptr<SampledData>& sample_data : samples) {
+        auto it = sample_data->battery_samples.find(battery_info->model_name);
+        if (it != sample_data->battery_samples.end())
+          battery_info_out->add_samples()->CheckTypeAndMergeFrom(it->second);
+      }
+    }
+
     // Process CpuResult.
     const auto& cpu_result = probe_result->cpu_result;
     if (!cpu_result.is_null()) {
@@ -976,13 +983,6 @@ class DeviceStatusCollectorState : public StatusCollectorState {
         }
       }
     }
-
-      for (const std::unique_ptr<SampledData>& sample_data : samples) {
-        auto it = sample_data->battery_samples.find(battery_info->model_name);
-        if (it != sample_data->battery_samples.end())
-          battery_info_out->add_samples()->CheckTypeAndMergeFrom(it->second);
-      }
-    }
   }
 
   void OnEMMCLifetimeReceived(const em::DiskLifetimeEstimation& est) {