Revert "Added isolate + thread high watermark tracking to Observatory"

runtime/vm/thread_test.cc

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "platform/assert.h"
 #include "vm/isolate.h"
 #include "vm/lockers.h"
 #include "vm/unit_test.h"
 #include "vm/profiler.h"
 #include "vm/safepoint.h"
@@ skipping 302 matching lines @@
     done_count = 0;
   }
 
   // Get the information for the current isolate.
   // We only need to check the current isolate since all tasks are spawned
   // inside this single isolate.
   JSONStream stream;
   isolate->PrintJSON(&stream, false);
   const char* json = stream.ToCString();
 
-  Thread* current_thread = Thread::Current();
-  {
-    StackZone stack_zone(current_thread);
-    char* isolate_info_buf = OS::SCreate(current_thread->zone(),
-                                         "\"isolateMemoryHighWatermark\":"
-                                         "%" Pd "",
-                                         isolate->GetIsolateHighWatermark());
-    EXPECT_SUBSTRING(isolate_info_buf, json);
-  }
-
   // Confirm all expected entries are in the JSON output.
   for (intptr_t i = 0; i < kTaskCount + 1; i++) {
     Thread* thread = threads[i];
     Zone* top_zone = thread->zone();
 
+    Thread* current_thread = Thread::Current();
     StackZone stack_zone(current_thread);
     Zone* current_zone = current_thread->zone();
 
     // Check that all zones are present with correct sizes.
     while (top_zone != NULL) {
       char* zone_info_buf =
           OS::SCreate(current_zone,
                       "\"type\":\"_Zone\","
                       "\"capacity\":%" Pd
                       ","
                       "\"used\":%" Pd "",
                       top_zone->CapacityInBytes(), top_zone->SizeInBytes());
       EXPECT_SUBSTRING(zone_info_buf, json);
       top_zone = top_zone->previous();
     }
 
     // Check the thread exists and is the correct size.
     char* thread_info_buf =
         OS::SCreate(current_zone,
                     "\"type\":\"_Thread\","
                     "\"id\":\"threads\\/%" Pd
                     "\","
-                    "\"kind\":\"%s\","
-                    "\"threadMemoryHighWatermark\":%" Pd "",
+                    "\"kind\":\"%s\"",
                     OSThread::ThreadIdToIntPtr(thread->os_thread()->trace_id()),
-                    Thread::TaskKindToCString(thread->task_kind()),
-                    thread->GetThreadHighWatermark());
+                    Thread::TaskKindToCString(thread->task_kind()));
 
     EXPECT_SUBSTRING(thread_info_buf, json);
   }
 
   // Unblock the tasks so they can finish.
   {
     MonitorLocker sync_ml(&sync);
     wait = false;
     sync_ml.NotifyAll();
   }
@@ skipping 428 matching lines @@
       TransitionVMToBlocked transition(thread);
       MonitorLocker ml(&done_monitor);
       if (done) {
         break;
       }
     }
   }
 }
 
 }  // namespace dart