Remove usages of HeapProfiler.finishHeapSnapshot from pyautolib

chrome/test/pyautolib/remote_inspector_client.py

 #!/usr/bin/env python
 # Copyright (c) 2012 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.
 
 """Chrome remote inspector utility for pyauto tests.
 
 This script provides a python interface that acts as a front-end for Chrome's
 remote inspector module, communicating via sockets to interact with Chrome in
 the same way that the Developer Tools does.  This -- in theory -- should allow
@@ skipping 833 matching lines @@
       Args:
         reply_dict: A dictionary object representing the reply message received
                      from the remote inspector.
       """
       if 'result' in reply_dict:
         # This is the result message associated with a previously-sent request.
         request = self._remote_inspector_thread.GetRequestWithId(
             reply_dict['id'])
         if 'frameTree' in reply_dict['result']:
           self._url = reply_dict['result']['frameTree']['frame']['url']
-      elif 'method' in reply_dict:
-        # This is an auxiliary message sent from the remote Chrome instance.
-        if reply_dict['method'] == self._agent_name + '.addProfileHeader':
-          snapshot_req = (
-              self._remote_inspector_thread.GetFirstUnfulfilledRequest(
-                  self._agent_name + '.takeHeapSnapshot'))
-          if snapshot_req:
-            snapshot_req.results['uid'] = reply_dict['params']['header']['uid']
-        elif reply_dict['method'] == self._agent_name + '.addHeapSnapshotChunk':
-          self._current_heap_snapshot.append(reply_dict['params']['chunk'])
-        elif reply_dict['method'] == self._agent_name + '.finishHeapSnapshot':
+        elif request.method == self._agent_name + '.getHeapSnapshot':
           # A heap snapshot has been completed.  Analyze and output the data.
           self._logger.debug('Heap snapshot taken: %s', self._url)
           # TODO(dennisjeffrey): Parse the heap snapshot on-the-fly as the data
           # is coming in over the wire, so we can avoid storing the entire
           # snapshot string in memory.
           raw_snapshot_data = ''.join(self._current_heap_snapshot)
           self._collected_heap_snapshot_data = {
               'url': self._url,
               'raw_data': raw_snapshot_data}
           if include_summary:
             self._logger.debug('Now analyzing heap snapshot...')
             parser = _V8HeapSnapshotParser()
             time_start = time.time()
             self._logger.debug('Raw snapshot data size: %.2f MB',
                                len(raw_snapshot_data) / (1024.0 * 1024.0))
             result = parser.ParseSnapshotData(raw_snapshot_data)
             self._logger.debug('Time to parse data: %.2f sec',
                                time.time() - time_start)
             count = result['total_v8_node_count']
             self._collected_heap_snapshot_data['total_v8_node_count'] = count
             total_size = result['total_shallow_size']
             self._collected_heap_snapshot_data['total_heap_size'] = total_size
 
           done_condition.acquire()
           done_condition.notify()
           done_condition.release()
+      elif 'method' in reply_dict:
+        # This is an auxiliary message sent from the remote Chrome instance.
+        if reply_dict['method'] == self._agent_name + '.addProfileHeader':
+          snapshot_req = (
+              self._remote_inspector_thread.GetFirstUnfulfilledRequest(
+                  self._agent_name + '.takeHeapSnapshot'))
+          if snapshot_req:
+            snapshot_req.results['uid'] = reply_dict['params']['header']['uid']
+        elif reply_dict['method'] == self._agent_name + '.addHeapSnapshotChunk':
+          self._current_heap_snapshot.append(reply_dict['params']['chunk'])
 
     # Tell the remote inspector to take a v8 heap snapshot, then wait until
     # the snapshot information is available to return.
     self._remote_inspector_thread.PerformAction(HEAP_SNAPSHOT_MESSAGES,
                                                 HandleReply)
 
     done_condition.acquire()
     done_condition.wait()
     done_condition.release()
 
@@ skipping 301 matching lines @@
       False otherwise.
 
     Raises:
       RuntimeError: If remote Chromium version hasn't been fetched yet.
     """
     if not hasattr(self, '_version'):
       raise RuntimeError('Browser revision has not been fetched yet.')
     version = self._version['browser']
 
     return version['day'] > day_number