Revert "Added page to Observatory to display native memory allocation information."

runtime/observatory/lib/src/cpu_profile/cpu_profile.dart

Index: runtime/observatory/lib/src/cpu_profile/cpu_profile.dart
diff --git a/runtime/observatory/lib/src/cpu_profile/cpu_profile.dart b/runtime/observatory/lib/src/cpu_profile/cpu_profile.dart
index 521fc192d323d6dac0914164bc65818e5058659d..1c6d9801228b0a47cb4b21762f6c3e80252521f2 100644
--- a/runtime/observatory/lib/src/cpu_profile/cpu_profile.dart
+++ b/runtime/observatory/lib/src/cpu_profile/cpu_profile.dart
@@ -8,8 +8,6 @@ abstract class CallTreeNode<NodeT extends M.CallTreeNode>
     implements M.CallTreeNode {
   final List<NodeT> children;
   final int count;
-  final int inclusiveNativeAllocations;
-  final int exclusiveNativeAllocations;
   double get percentage => _percentage;
   double _percentage = 0.0;
   final Set<String> attributes = new Set<String>();
@@ -18,8 +16,7 @@ abstract class CallTreeNode<NodeT extends M.CallTreeNode>
   Object get profileData;
   String get name;
 
-  CallTreeNode(this.children, this.count, this.inclusiveNativeAllocations,
-      this.exclusiveNativeAllocations);
+  CallTreeNode(this.children, this.count);
 }
 
 class CodeCallTreeNode extends CallTreeNode<CodeCallTreeNode>
@@ -31,10 +28,8 @@ class CodeCallTreeNode extends CallTreeNode<CodeCallTreeNode>
   String get name => profileCode.code.name;
 
   final Set<String> attributes = new Set<String>();
-  CodeCallTreeNode(this.profileCode, int count, int inclusiveNativeAllocations,
-      int exclusiveNativeAllocations)
-      : super(new List<CodeCallTreeNode>(), count, inclusiveNativeAllocations,
-            exclusiveNativeAllocations) {
+  CodeCallTreeNode(this.profileCode, int count)
+      : super(new List<CodeCallTreeNode>(), count) {
     attributes.addAll(profileCode.attributes);
   }
 }
@@ -49,23 +44,13 @@ class CallTree<NodeT extends CallTreeNode> {
 class CodeCallTree extends CallTree<CodeCallTreeNode>
     implements M.CodeCallTree {
   CodeCallTree(bool inclusive, CodeCallTreeNode root) : super(inclusive, root) {
-    if ((root.inclusiveNativeAllocations != null) &&
-        (root.inclusiveNativeAllocations != 0)) {
-      _setCodeMemoryPercentage(null, root);
-    } else {
-      _setCodePercentage(null, root);
-    }
+    _setCodePercentage(null, root);
   }
 
   CodeCallTree filtered(CallTreeNodeFilter filter) {
     var treeFilter = new _FilteredCodeCallTreeBuilder(filter, this);
     treeFilter.build();
-    if ((treeFilter.filtered.root.inclusiveNativeAllocations != null) &&
-        (treeFilter.filtered.root.inclusiveNativeAllocations != 0)) {
-      _setCodeMemoryPercentage(null, treeFilter.filtered.root);
-    } else {
-      _setCodePercentage(null, treeFilter.filtered.root);
-    }
+    _setCodePercentage(null, treeFilter.filtered.root);
     return treeFilter.filtered;
   }
 
@@ -87,25 +72,6 @@ class CodeCallTree extends CallTree<CodeCallTreeNode>
     }
   }
 
-  _setCodeMemoryPercentage(CodeCallTreeNode parent, CodeCallTreeNode node) {
-    assert(node != null);
-    var parentPercentage = 1.0;
-    var parentMemory = node.inclusiveNativeAllocations;
-    if (parent != null) {
-      parentPercentage = parent._percentage;
-      parentMemory = parent.inclusiveNativeAllocations;
-    }
-    if (inclusive) {
-      node._percentage =
-          parentPercentage * (node.inclusiveNativeAllocations / parentMemory);
-    } else {
-      node._percentage = (node.inclusiveNativeAllocations / parentMemory);
-    }
-    for (var child in node.children) {
-      _setCodeMemoryPercentage(node, child);
-    }
-  }
-
   _recordCallerAndCalleesInner(
       CodeCallTreeNode caller, CodeCallTreeNode callee) {
     if (caller != null) {
@@ -140,10 +106,8 @@ class FunctionCallTreeNode extends CallTreeNode {
   String get name => M.getFunctionFullName(profileFunction.function);
   Object get profileData => profileFunction;
 
-  FunctionCallTreeNode(this.profileFunction, int count,
-      inclusiveNativeAllocations, exclusiveNativeAllocations)
-      : super(new List<FunctionCallTreeNode>(), count,
-            inclusiveNativeAllocations, exclusiveNativeAllocations) {
+  FunctionCallTreeNode(this.profileFunction, int count)
+      : super(new List<FunctionCallTreeNode>(), count) {
     profileFunction._addKindBasedAttributes(attributes);
   }
 
@@ -326,14 +290,10 @@ class _FilteredFunctionCallTreeBuilder extends _FilteredCallTreeBuilder {
             new FunctionCallTree(
                 tree.inclusive,
                 new FunctionCallTreeNode(
-                    tree.root.profileData,
-                    tree.root.count,
-                    tree.root.inclusiveNativeAllocations,
-                    tree.root.exclusiveNativeAllocations)));
+                    tree.root.profileData, tree.root.count)));
 
   _copyNode(FunctionCallTreeNode node) {
-    return new FunctionCallTreeNode(node.profileData, node.count,
-        node.inclusiveNativeAllocations, node.exclusiveNativeAllocations);
+    return new FunctionCallTreeNode(node.profileData, node.count);
   }
 }
 
@@ -342,40 +302,24 @@ class _FilteredCodeCallTreeBuilder extends _FilteredCallTreeBuilder {
       : super(
             filter,
             tree,
-            new CodeCallTree(
-                tree.inclusive,
-                new CodeCallTreeNode(
-                    tree.root.profileData,
-                    tree.root.count,
-                    tree.root.inclusiveNativeAllocations,
-                    tree.root.exclusiveNativeAllocations)));
+            new CodeCallTree(tree.inclusive,
+                new CodeCallTreeNode(tree.root.profileData, tree.root.count)));
 
   _copyNode(CodeCallTreeNode node) {
-    return new CodeCallTreeNode(node.profileData, node.count,
-        node.inclusiveNativeAllocations, node.exclusiveNativeAllocations);
+    return new CodeCallTreeNode(node.profileData, node.count);
   }
 }
 
 class FunctionCallTree extends CallTree implements M.FunctionCallTree {
   FunctionCallTree(bool inclusive, FunctionCallTreeNode root)
       : super(inclusive, root) {
-    if ((root.inclusiveNativeAllocations != null) &&
-        (root.inclusiveNativeAllocations != 0)) {
-      _setFunctionMemoryPercentage(null, root);
-    } else {
-      _setFunctionPercentage(null, root);
-    }
+    _setFunctionPercentage(null, root);
   }
 
   FunctionCallTree filtered(CallTreeNodeFilter filter) {
     var treeFilter = new _FilteredFunctionCallTreeBuilder(filter, this);
     treeFilter.build();
-    if ((treeFilter.filtered.root.inclusiveNativeAllocations != null) &&
-        (treeFilter.filtered.root.inclusiveNativeAllocations != 0)) {
-      _setFunctionMemoryPercentage(null, treeFilter.filtered.root);
-    } else {
-      _setFunctionPercentage(null, treeFilter.filtered.root);
-    }
+    _setFunctionPercentage(null, treeFilter.filtered.root);
     return treeFilter.filtered;
   }
 
@@ -398,26 +342,6 @@ class FunctionCallTree extends CallTree implements M.FunctionCallTree {
     }
   }
 
-  void _setFunctionMemoryPercentage(
-      FunctionCallTreeNode parent, FunctionCallTreeNode node) {
-    assert(node != null);
-    var parentPercentage = 1.0;
-    var parentMemory = node.inclusiveNativeAllocations;
-    if (parent != null) {
-      parentPercentage = parent._percentage;
-      parentMemory = parent.inclusiveNativeAllocations;
-    }
-    if (inclusive) {
-      node._percentage =
-          parentPercentage * (node.inclusiveNativeAllocations / parentMemory);
-    } else {
-      node._percentage = (node.inclusiveNativeAllocations / parentMemory);
-    }
-    for (var child in node.children) {
-      _setFunctionMemoryPercentage(node, child);
-    }
-  }
-
   _markFunctionCallsInner(
       FunctionCallTreeNode caller, FunctionCallTreeNode callee) {
     if (caller != null) {
@@ -458,8 +382,6 @@ class ProfileCode implements M.ProfileCode {
   final Code code;
   int exclusiveTicks;
   int inclusiveTicks;
-  int exclusiveNativeAllocations;
-  int inclusiveNativeAllocations;
   double normalizedExclusiveTicks = 0.0;
   double normalizedInclusiveTicks = 0.0;
   final addressTicks = new Map<int, CodeTick>();
@@ -536,14 +458,6 @@ class ProfileCode implements M.ProfileCode {
       _processTicks(ticks);
     }
 
-    if (data.containsKey('exclusiveNativeAllocations') &&
-        data.containsKey('inclusiveNativeAllocations')) {
-      exclusiveNativeAllocations =
-          int.parse(data['exclusiveNativeAllocations']);
-      inclusiveNativeAllocations =
-          int.parse(data['inclusiveNativeAllocations']);
-    }
-
     formattedExclusivePercent =
         Utils.formatPercent(exclusiveTicks, profile.sampleCount);
 
@@ -595,10 +509,6 @@ class ProfileFunction implements M.ProfileFunction {
   double normalizedExclusiveTicks = 0.0;
   double normalizedInclusiveTicks = 0.0;
 
-  // Native allocations:
-  int exclusiveNativeAllocations = 0;
-  int inclusiveNativeAllocations = 0;
-
   String formattedInclusiveTicks = '';
   String formattedExclusiveTicks = '';
   String formattedExclusivePercent = '';
@@ -696,14 +606,6 @@ class ProfileFunction implements M.ProfileFunction {
     normalizedExclusiveTicks = exclusiveTicks / profile.sampleCount;
     normalizedInclusiveTicks = inclusiveTicks / profile.sampleCount;
 
-    if (data.containsKey('exclusiveNativeAllocations') &&
-        data.containsKey('inclusiveNativeAllocations')) {
-      exclusiveNativeAllocations =
-          int.parse(data['exclusiveNativeAllocations']);
-      inclusiveNativeAllocations =
-          int.parse(data['inclusiveNativeAllocations']);
-    }
-
     formattedExclusivePercent =
         Utils.formatPercent(exclusiveTicks, profile.sampleCount);
 
@@ -808,8 +710,8 @@ class CpuProfile extends M.SampleProfile {
     _builtFunctionCalls = false;
   }
 
-  Future load(ServiceObjectOwner owner, ServiceMap profile) async {
-    await loadProgress(owner, profile).last;
+  Future load(Isolate isolate, ServiceMap profile) async {
+    await loadProgress(isolate, profile).last;
   }
 
   static Future sleep([Duration duration = const Duration(microseconds: 0)]) {
@@ -818,7 +720,7 @@ class CpuProfile extends M.SampleProfile {
     return completer.future;
   }
 
-  Stream<double> loadProgress(ServiceObjectOwner owner, ServiceMap profile) {
+  Stream<double> loadProgress(Isolate isolate, ServiceMap profile) {
     var progress = new StreamController<double>.broadcast();
 
     (() async {
@@ -840,14 +742,12 @@ class CpuProfile extends M.SampleProfile {
       try {
         clear();
         progress.add(0.0);
-        if (profile == null) {
+        if ((isolate == null) || (profile == null)) {
           return;
         }
 
-        if ((owner != null) && (owner is Isolate)) {
-          isolate = owner as Isolate;
-          isolate.resetCachedProfileData();
-        }
+        this.isolate = isolate;
+        isolate.resetCachedProfileData();
 
         sampleCount = profile['sampleCount'];
         samplePeriod = profile['samplePeriod'];
@@ -924,13 +824,8 @@ class CpuProfile extends M.SampleProfile {
     var count = data[_dataCursor++];
     // Child node count.
     var children = data[_dataCursor++];
-    // Inclusive native allocations.
-    var inclusiveNativeAllocations = data[_dataCursor++];
-    // Exclusive native allocations.
-    var exclusiveNativeAllocations = data[_dataCursor++];
     // Create node.
-    var node = new CodeCallTreeNode(
-        code, count, inclusiveNativeAllocations, exclusiveNativeAllocations);
+    var node = new CodeCallTreeNode(code, count);
     node.children.length = children;
     return node;
   }
@@ -999,13 +894,8 @@ class CpuProfile extends M.SampleProfile {
     var function = functions[index];
     // Counter.
     var count = data[_dataCursor++];
-    // Inclusive native allocations.
-    var inclusiveNativeAllocations = data[_dataCursor++];
-    // Exclusive native allocations.
-    var exclusiveNativeAllocations = data[_dataCursor++];
     // Create node.
-    var node = new FunctionCallTreeNode(function, count,
-        inclusiveNativeAllocations, exclusiveNativeAllocations);
+    var node = new FunctionCallTreeNode(function, count);
     // Number of code index / count pairs.
     var codeCount = data[_dataCursor++];
     node.codes.length = codeCount;