[Telemetry SWX] Reorder diagnostics methods

Reorder GetService() and OnDisconnect from diagnostics_service.h.
Fix wrong service name from comment.

Added DiagnosticRoutineEnum Convert to diagnostics_service_converters.h
because vector Convert method uses it and needs to be the first method
of the file.

Reorder methods from diagnostics_service_converters.h.

Bug: b:166723291
Change-Id: Iaf2d2484701393e7a9abc4ad387e2a8e4c0bece4
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2410241
Commit-Queue: Laurențiu Olteanu <lolteanu@google.com>
Reviewed-by: Oleh Lamzin <lamzin@google.com>
Reviewed-by: Mahmoud Gawad <mgawad@google.com>
Cr-Commit-Position: refs/heads/master@{#807399}

chromeos/components/telemetry_extension_ui/diagnostics_service.h

@@ -26,6 +26,12 @@ class DiagnosticsService : public health::mojom::DiagnosticsService {
   ~DiagnosticsService() override;
 
  private:
+  // Ensures that |service_| created and connected to the
+  // CrosHealthdDiagnosticsService.
+  cros_healthd::mojom::CrosHealthdDiagnosticsService* GetService();
+
+  void OnDisconnect();
+
   void GetAvailableRoutines(GetAvailableRoutinesCallback callback) override;
   void GetRoutineUpdate(int32_t id,
                         health::mojom::DiagnosticRoutineCommandEnum command,
@@ -58,12 +64,6 @@ class DiagnosticsService : public health::mojom::DiagnosticsService {
       health::mojom::NvmeSelfTestTypeEnum nvme_self_test_type,
       RunNvmeSelfTestRoutineCallback callback) override;
 
-  // Ensures that |service_| created and connected to the
-  // CrosHealthdProbeService.
-  cros_healthd::mojom::CrosHealthdDiagnosticsService* GetService();
-
-  void OnDisconnect();
-
   // Pointer to real implementation.
   mojo::Remote<cros_healthd::mojom::CrosHealthdDiagnosticsService> service_;
 

chromeos/components/telemetry_extension_ui/diagnostics_service_converters.cc

@@ -16,10 +16,22 @@ namespace converters {
 
 namespace unchecked {
 
+namespace {
+
+std::string GetStringFromMojoHandle(mojo::ScopedHandle handle) {
+  base::ReadOnlySharedMemoryMapping shared_memory;
+  return MojoUtils::GetStringPieceFromMojoHandle(std::move(handle),
+                                                 &shared_memory)
+      .as_string();
+}
+
+}  // namespace
+
 health::mojom::RoutineUpdatePtr UncheckedConvertPtr(
     cros_healthd::mojom::RoutineUpdatePtr input) {
   return health::mojom::RoutineUpdate::New(
-      input->progress_percent, Convert(std::move(input->output)),
+      input->progress_percent,
+      GetStringFromMojoHandle(std::move(input->output)),
       ConvertPtr(std::move(input->routine_update_union)));
 }
 
@@ -55,53 +67,6 @@ health::mojom::RunRoutineResponsePtr UncheckedConvertPtr(
 
 }  // namespace unchecked
 
-health::mojom::DiagnosticRoutineStatusEnum Convert(
-    cros_healthd::mojom::DiagnosticRoutineStatusEnum input) {
-  switch (input) {
-    case cros_healthd::mojom::DiagnosticRoutineStatusEnum::kReady:
-      return health::mojom::DiagnosticRoutineStatusEnum::kReady;
-    case cros_healthd::mojom::DiagnosticRoutineStatusEnum::kRunning:
-      return health::mojom::DiagnosticRoutineStatusEnum::kRunning;
-    case cros_healthd::mojom::DiagnosticRoutineStatusEnum::kWaiting:
-      return health::mojom::DiagnosticRoutineStatusEnum::kWaiting;
-    case cros_healthd::mojom::DiagnosticRoutineStatusEnum::kPassed:
-      return health::mojom::DiagnosticRoutineStatusEnum::kPassed;
-    case cros_healthd::mojom::DiagnosticRoutineStatusEnum::kFailed:
-      return health::mojom::DiagnosticRoutineStatusEnum::kFailed;
-    case cros_healthd::mojom::DiagnosticRoutineStatusEnum::kError:
-      return health::mojom::DiagnosticRoutineStatusEnum::kError;
-    case cros_healthd::mojom::DiagnosticRoutineStatusEnum::kCancelled:
-      return health::mojom::DiagnosticRoutineStatusEnum::kCancelled;
-    case cros_healthd::mojom::DiagnosticRoutineStatusEnum::kFailedToStart:
-      return health::mojom::DiagnosticRoutineStatusEnum::kFailedToStart;
-    case cros_healthd::mojom::DiagnosticRoutineStatusEnum::kRemoved:
-      return health::mojom::DiagnosticRoutineStatusEnum::kRemoved;
-    case cros_healthd::mojom::DiagnosticRoutineStatusEnum::kCancelling:
-      return health::mojom::DiagnosticRoutineStatusEnum::kCancelling;
-    case cros_healthd::mojom::DiagnosticRoutineStatusEnum::kUnsupported:
-      return health::mojom::DiagnosticRoutineStatusEnum::kUnsupported;
-  }
-  NOTREACHED();
-  return static_cast<health::mojom::DiagnosticRoutineStatusEnum>(
-      static_cast<int>(health::mojom::DiagnosticRoutineStatusEnum::kMaxValue) +
-      1);
-}
-
-health::mojom::DiagnosticRoutineUserMessageEnum Convert(
-    cros_healthd::mojom::DiagnosticRoutineUserMessageEnum input) {
-  switch (input) {
-    case cros_healthd::mojom::DiagnosticRoutineUserMessageEnum::kUnplugACPower:
-      return health::mojom::DiagnosticRoutineUserMessageEnum::kUnplugACPower;
-    case cros_healthd::mojom::DiagnosticRoutineUserMessageEnum::kPlugInACPower:
-      return health::mojom::DiagnosticRoutineUserMessageEnum::kPlugInACPower;
-  }
-  NOTREACHED();
-  return static_cast<health::mojom::DiagnosticRoutineUserMessageEnum>(
-      static_cast<int>(
-          health::mojom::DiagnosticRoutineUserMessageEnum::kMaxValue) +
-      1);
-}
-
 base::Optional<health::mojom::DiagnosticRoutineEnum> Convert(
     cros_healthd::mojom::DiagnosticRoutineEnum input) {
   switch (input) {
@@ -134,11 +99,64 @@ base::Optional<health::mojom::DiagnosticRoutineEnum> Convert(
   }
 }
 
-std::string Convert(mojo::ScopedHandle handle) {
-  base::ReadOnlySharedMemoryMapping shared_memory;
-  return MojoUtils::GetStringPieceFromMojoHandle(std::move(handle),
-                                                 &shared_memory)
-      .as_string();
+std::vector<health::mojom::DiagnosticRoutineEnum> Convert(
+    const std::vector<cros_healthd::mojom::DiagnosticRoutineEnum>& input) {
+  std::vector<health::mojom::DiagnosticRoutineEnum> output;
+  for (const auto element : input) {
+    base::Optional<health::mojom::DiagnosticRoutineEnum> converted =
+        Convert(element);
+    if (converted.has_value()) {
+      output.push_back(converted.value());
+    }
+  }
+  return output;
+}
+
+health::mojom::DiagnosticRoutineUserMessageEnum Convert(
+    cros_healthd::mojom::DiagnosticRoutineUserMessageEnum input) {
+  switch (input) {
+    case cros_healthd::mojom::DiagnosticRoutineUserMessageEnum::kUnplugACPower:
+      return health::mojom::DiagnosticRoutineUserMessageEnum::kUnplugACPower;
+    case cros_healthd::mojom::DiagnosticRoutineUserMessageEnum::kPlugInACPower:
+      return health::mojom::DiagnosticRoutineUserMessageEnum::kPlugInACPower;
+  }
+  NOTREACHED();
+  return static_cast<health::mojom::DiagnosticRoutineUserMessageEnum>(
+      static_cast<int>(
+          health::mojom::DiagnosticRoutineUserMessageEnum::kMaxValue) +
+      1);
+}
+
+health::mojom::DiagnosticRoutineStatusEnum Convert(
+    cros_healthd::mojom::DiagnosticRoutineStatusEnum input) {
+  switch (input) {
+    case cros_healthd::mojom::DiagnosticRoutineStatusEnum::kReady:
+      return health::mojom::DiagnosticRoutineStatusEnum::kReady;
+    case cros_healthd::mojom::DiagnosticRoutineStatusEnum::kRunning:
+      return health::mojom::DiagnosticRoutineStatusEnum::kRunning;
+    case cros_healthd::mojom::DiagnosticRoutineStatusEnum::kWaiting:
+      return health::mojom::DiagnosticRoutineStatusEnum::kWaiting;
+    case cros_healthd::mojom::DiagnosticRoutineStatusEnum::kPassed:
+      return health::mojom::DiagnosticRoutineStatusEnum::kPassed;
+    case cros_healthd::mojom::DiagnosticRoutineStatusEnum::kFailed:
+      return health::mojom::DiagnosticRoutineStatusEnum::kFailed;
+    case cros_healthd::mojom::DiagnosticRoutineStatusEnum::kError:
+      return health::mojom::DiagnosticRoutineStatusEnum::kError;
+    case cros_healthd::mojom::DiagnosticRoutineStatusEnum::kCancelled:
+      return health::mojom::DiagnosticRoutineStatusEnum::kCancelled;
+    case cros_healthd::mojom::DiagnosticRoutineStatusEnum::kFailedToStart:
+      return health::mojom::DiagnosticRoutineStatusEnum::kFailedToStart;
+    case cros_healthd::mojom::DiagnosticRoutineStatusEnum::kRemoved:
+      return health::mojom::DiagnosticRoutineStatusEnum::kRemoved;
+    case cros_healthd::mojom::DiagnosticRoutineStatusEnum::kCancelling:
+      return health::mojom::DiagnosticRoutineStatusEnum::kCancelling;
+    case cros_healthd::mojom::DiagnosticRoutineStatusEnum::kUnsupported:
+      return health::mojom::DiagnosticRoutineStatusEnum::kUnsupported;
+  }
+  NOTREACHED();
+  return static_cast<health::mojom::DiagnosticRoutineStatusEnum>(
+      static_cast<int>(health::mojom::DiagnosticRoutineStatusEnum::kMaxValue) +
+      1);
 }
 
 cros_healthd::mojom::DiagnosticRoutineCommandEnum Convert(
@@ -160,19 +178,6 @@ cros_healthd::mojom::DiagnosticRoutineCommandEnum Convert(
       1);
 }
 
-std::vector<health::mojom::DiagnosticRoutineEnum> Convert(
-    const std::vector<cros_healthd::mojom::DiagnosticRoutineEnum>& input) {
-  std::vector<health::mojom::DiagnosticRoutineEnum> output;
-  for (const auto element : input) {
-    base::Optional<health::mojom::DiagnosticRoutineEnum> converted =
-        Convert(element);
-    if (converted.has_value()) {
-      output.push_back(converted.value());
-    }
-  }
-  return output;
-}
-
 cros_healthd::mojom::AcPowerStatusEnum Convert(
     health::mojom::AcPowerStatusEnum input) {
   switch (input) {

chromeos/components/telemetry_extension_ui/diagnostics_service_converters.h

@@ -42,6 +42,9 @@ health::mojom::RunRoutineResponsePtr UncheckedConvertPtr(
 
 }  // namespace unchecked
 
+base::Optional<health::mojom::DiagnosticRoutineEnum> Convert(
+    cros_healthd::mojom::DiagnosticRoutineEnum input);
+
 std::vector<health::mojom::DiagnosticRoutineEnum> Convert(
     const std::vector<cros_healthd::mojom::DiagnosticRoutineEnum>& input);
 
@@ -54,8 +57,6 @@ health::mojom::DiagnosticRoutineStatusEnum Convert(
 cros_healthd::mojom::DiagnosticRoutineCommandEnum Convert(
     health::mojom::DiagnosticRoutineCommandEnum input);
 
-std::string Convert(mojo::ScopedHandle handle);
-
 cros_healthd::mojom::AcPowerStatusEnum Convert(
     health::mojom::AcPowerStatusEnum input);