Revert "Diagnostics: Add skeleton battery health card"

- Mocks changed and this functionality is now all combined
  in the battery status card
- This reverts commit a407643d.

Bug: 1125150
Test: browser_tests --gtest_filter=DiagnosticsApp*
Change-Id: I0a8f9356039885bba84a2df3a3eb3771893995c2
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2422818Reviewed-by: Bailey Berro <baileyberro@chromium.org>
Commit-Queue: Zentaro Kavanagh <zentaro@chromium.org>
Cr-Commit-Position: refs/heads/master@{#809548}

chrome/test/data/webui/chromeos/diagnostics/diagnostics_test.js

@@ -85,60 +85,12 @@ suite('DiagnosticsAppTest', () => {
     const cpu = page.$$('#cpuCard');
     assertTrue(!!cpu);
 
-    // Verify the battery health card is in the page.
-    const batteryHealth = page.$$('#batteryHealthCard');
-    assertTrue(!!batteryHealth);
-
     // Verify the battery status card is in the page.
     const batteryStatus = page.$$('#batteryStatusCard');
     assertTrue(!!batteryStatus);
   });
 });
 
-suite('BatteryHealthCardTest', () => {
-  /** @type {?HTMLElement} */
-  let batteryHealthElement = null;
-
-  /** @type {?FakeSystemDataProvider} */
-  let provider = null;
-
-  suiteSetup(() => {
-    provider = new FakeSystemDataProvider();
-    setSystemDataProviderForTesting(provider);
-  });
-
-  setup(function() {
-    PolymerTest.clearBody();
-  });
-
-  teardown(function() {
-    if (batteryHealthElement) {
-      batteryHealthElement.remove();
-    }
-    batteryHealthElement = null;
-    provider = null;
-  });
-
-  function initializeBatteryHealthCard() {
-    assertFalse(!!batteryHealthElement);
-
-    // Add the battery health card to the DOM.
-    batteryHealthElement = document.createElement('battery-health-card');
-    assertTrue(!!batteryHealthElement);
-    document.body.appendChild(batteryHealthElement);
-
-    return flushTasks();
-  }
-
-  test('BatteryHealthCardPopulated', () => {
-    return initializeBatteryHealthCard().then(() => {
-      // TODO(zentaro): Update when strings are finalized.
-      assertEquals(
-          'Battery Health', batteryHealthElement.$$('#cardTitle').textContent);
-    });
-  });
-});
-
 suite('BatteryStatusCardTest', () => {
   /** @type {?HTMLElement} */
   let batteryStatusElement = null;

chromeos/components/diagnostics_ui/resources/BUILD.gn

@@ -10,7 +10,6 @@ import("//tools/polymer/html_to_js.gni")
 js_type_check("closure_compile_module") {
   is_polymer3 = true
   deps = [
-    ":battery_health_card",
     ":battery_status_card",
     ":cpu_card",
     ":diagnostics_app",
@@ -25,12 +24,6 @@ js_type_check("closure_compile_module") {
   ]
 }
 
-js_library("battery_health_card") {
-  deps = [
-    "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
-  ]
-}
-
 js_library("battery_status_card") {
   deps = [
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
@@ -45,7 +38,6 @@ js_library("cpu_card") {
 
 js_library("diagnostics_app") {
   deps = [
-    ":battery_health_card",
     ":battery_status_card",
     ":cpu_card",
     ":diagnostics_card",
@@ -100,7 +92,6 @@ js_library("overview_card") {
 
 html_to_js("web_components") {
   js_files = [
-    "battery_health_card.js",
     "battery_status_card.js",
     "cpu_card.js",
     "diagnostics_app.js",

chromeos/components/diagnostics_ui/resources/battery_health_card.html

-<style include="diagnostics-shared">
-</style>
-
-<diagnostics-card>
-  <div slot="title">
-    <!-- TODO(zentaro) Localize once strings are confirmed -->
-    <div id="cardTitle">Battery Health</div>
-  </div>
-  <div slot="body">
-  </div>
-</diagnostics-card>

chromeos/components/diagnostics_ui/resources/battery_health_card.js

-// Copyright 2020 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-import './diagnostics_card.js';
-import './diagnostics_shared_css.js';
-
-import {html, Polymer} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
-import {SystemDataProviderInterface} from './diagnostics_types.js'
-import {getSystemDataProvider} from './mojo_interface_provider.js';
-
-/**
- * @fileoverview
- * 'battery-health-card' shows information about battery health.
- */
-Polymer({
-  is: 'battery-health-card',
-
-  _template: html`{__html_template__}`,
-
-  /**
-   * @private {?SystemDataProviderInterface}
-   */
-  systemDataProvider_: null,
-
-  /** @override */
-  created() {
-    this.systemDataProvider_ = getSystemDataProvider();
-  },
-
-});

chromeos/components/diagnostics_ui/resources/diagnostics_app.html

@@ -8,8 +8,6 @@
     <hr>
     <cpu-card id="cpuCard"></cpu-card>
     <hr>
-    <battery-health-card id="batteryHealthCard"></battery-health-card>
-    <hr>
     <battery-status-card id="batteryStatusCard"></battery-status-card>
     <hr>
 </div>

chromeos/components/diagnostics_ui/resources/diagnostics_app.js

@@ -2,7 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import './battery_health_card.js';
 import './battery_status_card.js';
 import './cpu_card.js';
 import './diagnostics_shared_css.js';

chromeos/components/diagnostics_ui/resources/diagnostics_app_resources.grd

@@ -16,7 +16,6 @@
       <include name="IDR_DIAGNOSTICS_APP_ICON" file="app_icon_192.png" type="BINDATA" />
       <include name="IDR_DIAGNOSTICS_APP_INDEX_HTML" file="index.html" type="BINDATA" />
       <include name="IDR_DIAGNOSTICS_APP_JS" file="${root_gen_dir}/chromeos/components/diagnostics_ui/resources/diagnostics_app.js" use_base_dir="false" type="BINDATA"/>
-      <include name="IDR_DIAGNOSTICS_BATTERY_HEALTH_CARD_JS" file="${root_gen_dir}/chromeos/components/diagnostics_ui/resources/battery_health_card.js" use_base_dir="false" type="BINDATA"/>
       <include name="IDR_DIAGNOSTICS_BATTERY_STATUS_CARD_JS" file="${root_gen_dir}/chromeos/components/diagnostics_ui/resources/battery_status_card.js" use_base_dir="false" type="BINDATA"/>
       <include name="IDR_DIAGNOSTICS_CARD_JS" file="${root_gen_dir}/chromeos/components/diagnostics_ui/resources/diagnostics_card.js" use_base_dir="false" type="BINDATA"/>
       <include name="IDR_DIAGNOSTICS_CPU_CARD_JS" file="${root_gen_dir}/chromeos/components/diagnostics_ui/resources/cpu_card.js" use_base_dir="false" type="BINDATA"/>