Diagnostics: Wire up the memory card

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

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

@@ -286,9 +286,16 @@ suite('MemoryCardTest', () => {
     provider = null;
   });
 
-  function initializeMemoryCard() {
+  /**
+   * @param {!MemoryUsage} memoryUsage
+   * @return {!Promise}
+   */
+  function initializeMemoryCard(memoryUsage) {
     assertFalse(!!memoryElement);
 
+    // Initialize the fake data.
+    provider.setFakeMemoryUsage(memoryUsage);
+
     // Add the memory card to the DOM.
     memoryElement = document.createElement('memory-card');
     assertTrue(!!memoryElement);
@@ -298,9 +305,19 @@ suite('MemoryCardTest', () => {
   }
 
   test('MemoryCardPopulated', () => {
-    return initializeMemoryCard().then(() => {
+    return initializeMemoryCard(fakeMemoryUsage).then(() => {
       // TODO(zentaro): Update when strings are finalized.
       assertEquals('Memory', memoryElement.$$('#cardTitle').textContent);
+
+      assertEquals(
+          fakeMemoryUsage[0].total_memory_kib.toString(),
+          memoryElement.$$('#memoryTotal').textContent);
+      assertEquals(
+          fakeMemoryUsage[0].available_memory_kib.toString(),
+          memoryElement.$$('#memoryAvailable').textContent);
+      assertEquals(
+          fakeMemoryUsage[0].free_memory_kib.toString(),
+          memoryElement.$$('#memoryFree').textContent);
     });
   });
 });

chromeos/components/diagnostics_ui/resources/memory_card.html

@@ -7,5 +7,8 @@
     <div id="cardTitle">Memory</div>
   </div>
   <div slot="body">
+    <div id="memoryTotal">[[memoryUsage_.total_memory_kib]]</div>
+    <div id="memoryAvailable">[[memoryUsage_.available_memory_kib]]</div>
+    <div id="memoryFree">[[memoryUsage_.free_memory_kib]]</div>
   </div>
 </diagnostics-card>

chromeos/components/diagnostics_ui/resources/memory_card.js

@@ -6,7 +6,7 @@ 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 {MemoryUsage, SystemDataProviderInterface} from './diagnostics_types.js'
 import {getSystemDataProvider} from './mojo_interface_provider.js';
 
 /**
@@ -23,9 +23,30 @@ Polymer({
    */
   systemDataProvider_: null,
 
+  properties: {
+    /** @private {!MemoryUsage} */
+    memoryUsage_: {
+      type: Object,
+    },
+  },
+
   /** @override */
   created() {
     this.systemDataProvider_ = getSystemDataProvider();
+    this.observeMemoryUsage_();
+  },
+
+  /** @private */
+  observeMemoryUsage_() {
+    this.systemDataProvider_.observeMemoryUsage(this);
+  },
+
+  /**
+   * Implements MemoryUsageObserver.onMemoryUsageUpdated()
+   * @param {!MemoryUsage} memoryUsage
+   */
+  onMemoryUsageUpdated(memoryUsage) {
+    this.memoryUsage_ = memoryUsage;
   },
 
 });

chromeos/components/diagnostics_ui/resources/mojo_interface_provider.js

@@ -4,7 +4,7 @@
 
 import {assert} from 'chrome://resources/js/assert.m.js';
 import {SystemDataProviderInterface, SystemInfo} from './diagnostics_types.js'
-import {fakeBatteryInfo, fakeCpuUsage, fakeSystemInfo} from './fake_data.js'
+import {fakeBatteryInfo, fakeCpuUsage, fakeMemoryUsage, fakeSystemInfo} from './fake_data.js'
 import {FakeSystemDataProvider} from './fake_system_data_provider.js'
 
 /**
@@ -24,6 +24,7 @@ function setupFakeSystemDataProvider_() {
   // Setup fake method data.
   provider.setFakeBatteryInfo(fakeBatteryInfo);
   provider.setFakeCpuUsage(fakeCpuUsage);
+  provider.setFakeMemoryUsage(fakeMemoryUsage);
   provider.setFakeSystemInfo(fakeSystemInfo);
 
   // Set the fake provider.