DevTools: Make performance monitor report a single process memory again.

BUG=832364

Change-Id: I4baf520742f740bc296eb12ce76d9e82796f9f9a
Reviewed-on: https://chromium-review.googlesource.com/1011586
Reviewed-by: Dmitry Gozman <dgozman@chromium.org>
Commit-Queue: Alexei Filippov <alph@chromium.org>
Cr-Commit-Position: refs/heads/master@{#550704}

third_party/WebKit/LayoutTests/http/tests/devtools/oopif/oopif-performance-monitor-expected.txt

@@ -1,4 +1,4 @@
-Tests list of performance metrics and that memory is not double counted.
+Tests stability of performance metrics list.
 
 
 Metrics reported:
@@ -31,11 +31,3 @@ UACSSResources
 V8PerContextDatas
 WorkerGlobalScopes
 
-Targets after navigate
-Main
-iframe.html
-inner-iframe.html
-inner-iframe.html
-
-metrics size is twice smaller than simple sum: true
-

third_party/WebKit/LayoutTests/http/tests/devtools/oopif/oopif-performance-monitor.js

@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 (async function() {
-  TestRunner.addResult(`Tests list of performance metrics and that memory is not double counted.\n`);
+  TestRunner.addResult(`Tests stability of performance metrics list.\n`);
 
   const model = SDK.targetManager.mainTarget().model(SDK.PerformanceMetricsModel);
   await model.enable();
@@ -12,21 +12,5 @@
   TestRunner.addResult('\nMetrics reported:');
   TestRunner.addResults(metrics.keysArray().sort());
 
-  await TestRunner.navigatePromise('resources/page.html');
-  TestRunner.addResult('\nTargets after navigate');
-  TestRunner.addResults(SDK.targetManager.targets().map(t => t.name()).sort());
-
-  let lastTotal, total;
-  do {
-    metrics = (await model.requestMetrics()).metrics;
-    lastTotal = total;
-    total = 0;
-    for (const m of SDK.targetManager.models(SDK.RuntimeModel))
-      total += (await m.heapUsage()).totalSize;
-  } while (total !== lastTotal);
-
-  TestRunner.addResult('\nmetrics size is twice smaller than simple sum: ' +
-      (metrics.get('JSHeapTotalSize') * 2 === total));
-
   TestRunner.completeTest();
 })();

third_party/blink/renderer/devtools/front_end/sdk/PerformanceMetricsModel.js

@@ -71,31 +71,8 @@ SDK.PerformanceMetricsModel = class extends SDK.SDKModel {
       }
       metrics.set(metric.name, value);
     }
-    const totalMemoryUsage = await this._requestTotalMemory();
-    metrics.set('JSHeapUsedSize', totalMemoryUsage.usedSize);
-    metrics.set('JSHeapTotalSize', totalMemoryUsage.totalSize);
     return {metrics: metrics, timestamp: timestamp};
   }
-
-  /**
-   * @return {!Promise<!{usedSize: number, totalSize: number}>}
-   */
-  async _requestTotalMemory() {
-    const models = SDK.targetManager.models(SDK.RuntimeModel);
-    const isolates = await Promise.all(models.map(model => model.isolateId()));
-    /** @type {!Map<string, !SDK.RuntimeModel>} */
-    const modelsByIsolate = new Map();
-    for (let i = 0; i < isolates.length; ++i)
-      modelsByIsolate.set(isolates[i], models[i]);
-    const usages = await Promise.all(modelsByIsolate.valuesArray().map(model => model.heapUsage()));
-    let totalSize = 0;
-    let usedSize = 0;
-    for (const usage of usages) {
-      totalSize += usage ? usage.totalSize : 0;
-      usedSize += usage ? usage.usedSize : 0;
-    }
-    return {totalSize, usedSize};
-  }
 };
 
 /** @enum {symbol} */