shimless: Update components to match latest proto

Remove kGyroscope and add kBaseGyroscope and kLidGyroscope.

      autoninja -C out/Default/ ash/webui/shimless_rma/resources:closure_compile_module
      autoninja -C out/Default/ chrome/test/data/webui/chromeos/shimless_rma:closure_compile

Bug: b:202845021, 1198187
Test: Run browser tests for Shimless*
Change-Id: I6a3cf8fdd19354fecdb9738ff4d4ad94385a0237
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3221796
Reviewed-by: Gavin Williams <gavinwill@chromium.org>
Reviewed-by: Alex Gough <ajgo@chromium.org>
Commit-Queue: Gavin Dodd <gavindodd@google.com>
Cr-Commit-Position: refs/heads/main@{#931352}

ash/webui/shimless_rma/mojom/shimless_rma.mojom

@@ -232,12 +232,13 @@ enum ComponentType {
   kScreen = 15,
   kBaseAccelerometer = 16,
   kLidAccelerometer = 17,
-  kGyroscope = 18,
+  kBaseGyroscope = 18,
+  kLidGyroscope = 19,
 
   // Irrelevant components.
   // TODO(chenghan): Do we really need these?
-  kKeyboard = 19,
-  kPowerButton = 20,
+  kKeyboard = 20,
+  kPowerButton = 21,
 };
 
 // Component repair state

ash/webui/shimless_rma/mojom/shimless_rma_mojom_traits.cc

@@ -442,8 +442,10 @@ MojomComponentType EnumTraits<MojomComponentType, ProtoComponentType>::ToMojom(
       return MojomComponentType::kBaseAccelerometer;
     case rmad::RmadComponent::RMAD_COMPONENT_LID_ACCELEROMETER:
       return MojomComponentType::kLidAccelerometer;
-    case rmad::RmadComponent::RMAD_COMPONENT_GYROSCOPE:
-      return MojomComponentType::kGyroscope;
+    case rmad::RmadComponent::RMAD_COMPONENT_BASE_GYROSCOPE:
+      return MojomComponentType::kBaseGyroscope;
+    case rmad::RmadComponent::RMAD_COMPONENT_LID_GYROSCOPE:
+      return MojomComponentType::kLidGyroscope;
 
     case rmad::RmadComponent::RMAD_COMPONENT_KEYBOARD:
       return MojomComponentType::kKeyboard;
@@ -517,8 +519,11 @@ bool EnumTraits<MojomComponentType, ProtoComponentType>::FromMojom(
     case MojomComponentType::kLidAccelerometer:
       *out = rmad::RmadComponent::RMAD_COMPONENT_LID_ACCELEROMETER;
       return true;
-    case MojomComponentType::kGyroscope:
-      *out = rmad::RmadComponent::RMAD_COMPONENT_GYROSCOPE;
+    case MojomComponentType::kBaseGyroscope:
+      *out = rmad::RmadComponent::RMAD_COMPONENT_BASE_GYROSCOPE;
+      return true;
+    case MojomComponentType::kLidGyroscope:
+      *out = rmad::RmadComponent::RMAD_COMPONENT_LID_GYROSCOPE;
       return true;
 
     case MojomComponentType::kKeyboard:

ash/webui/shimless_rma/mojom/shimless_rma_mojom_traits_unittest.cc

@@ -226,12 +226,14 @@ TEST_F(ShimlessRmaMojoToProtoTest, RepairComponentsMatch) {
            {mojom::ComponentType::kWireless,
             rmad::RmadComponent::RMAD_COMPONENT_WIRELESS},
            // Additional rmad components.
-           {mojom::ComponentType::kGyroscope,
-            rmad::RmadComponent::RMAD_COMPONENT_GYROSCOPE},
            {mojom::ComponentType::kBaseAccelerometer,
             rmad::RmadComponent::RMAD_COMPONENT_BASE_ACCELEROMETER},
            {mojom::ComponentType::kLidAccelerometer,
             rmad::RmadComponent::RMAD_COMPONENT_LID_ACCELEROMETER},
+           {mojom::ComponentType::kBaseGyroscope,
+            rmad::RmadComponent::RMAD_COMPONENT_BASE_GYROSCOPE},
+           {mojom::ComponentType::kLidGyroscope,
+            rmad::RmadComponent::RMAD_COMPONENT_LID_GYROSCOPE},
            {mojom::ComponentType::kScreen,
             rmad::RmadComponent::RMAD_COMPONENT_SCREEN},
 

ash/webui/shimless_rma/resources/data.js

@@ -23,9 +23,10 @@ export const ComponentTypeToName = {
   [ComponentType.kCellular]: 'Cellular',
   [ComponentType.kEthernet]: 'Ethernet',
   [ComponentType.kWireless]: 'Wireless',
-  [ComponentType.kGyroscope]: 'Gyroscope',
   [ComponentType.kBaseAccelerometer]: 'Base Accelerometer',
   [ComponentType.kLidAccelerometer]: 'Lid Accelerometer',
+  [ComponentType.kBaseGyroscope]: 'Base Gyroscope',
+  [ComponentType.kLidGyroscope]: 'Lid Gyroscope',
   [ComponentType.kScreen]: 'Screen',
   [ComponentType.kKeyboard]: 'Keyboard',
   [ComponentType.kPowerButton]: 'Power Button'
@@ -49,9 +50,10 @@ export const ComponentTypeToId = {
   [ComponentType.kCellular]: 'componentCellular',
   [ComponentType.kEthernet]: 'componentEthernet',
   [ComponentType.kWireless]: 'componentWireless',
-  [ComponentType.kGyroscope]: 'componentGyroscope',
   [ComponentType.kBaseAccelerometer]: 'componentBaseAccelerometer',
   [ComponentType.kLidAccelerometer]: 'componentLidAccelerometer',
+  [ComponentType.kBaseGyroscope]: 'componentBaseGyroscope',
+  [ComponentType.kLidGyroscope]: 'componentLidGyroscope',
   [ComponentType.kScreen]: 'componentScreen',
   [ComponentType.kKeyboard]: 'componentKeyboard',
   [ComponentType.kPowerButton]: 'componentPowerButton'

ash/webui/shimless_rma/resources/fake_shimless_rma_service.js

@@ -739,7 +739,7 @@ export class FakeShimlessRmaService {
           8000);
       this.triggerCalibrationObserver(
           {
-            component: ComponentType.kGyroscope,
+            component: ComponentType.kBaseGyroscope,
             status: CalibrationStatus.kCalibrationSkip,
             progress: 1.0
           },

chrome/test/data/webui/chromeos/shimless_rma/reimaging_calibration_run_page_test.js

@@ -172,7 +172,7 @@ export function reimagingCalibrationRunPageTest() {
     let message = statusMessage.innerHTML;
     service.triggerCalibrationObserver(
         {
-          component: ComponentType.kGyroscope,
+          component: ComponentType.kBaseGyroscope,
           status: CalibrationStatus.kCalibrationInProgress,
           progress: 0.5
         },