Delete Automation[Tab/Renderer]Helper and users.

chrome/test/pyautolib/pyauto.py

 #!/usr/bin/env python
 # Copyright 2013 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.
 
 """PyAuto: Python Interface to Chromium's Automation Proxy.
 
 PyAuto uses swig to expose Automation Proxy interfaces to Python.
 For complete documentation on the functionality available,
 run pydoc on this file.
@@ skipping 3610 matching lines @@
 
     Returns:
       a string that was sent back via the domAutomationController.send method
     """
     converted_args = map(lambda arg: json.dumps(arg), args)
     js = '%s(%s)' % (function, ', '.join(converted_args))
     logging.debug('Executing javascript: %s', js)
     return self.ExecuteJavascript(js, tab_index, windex)
 
   def HeapProfilerDump(self, process_type, reason, tab_index=0, windex=0):
-    """Dumps a heap profile.  It works only on Linux and ChromeOS.
+    """Dumps a heap profile. It works only on Linux and ChromeOS.
 
     We need an environment variable "HEAPPROFILE" set to a directory and a
     filename prefix, for example, "/tmp/prof".  In a case of this example,
     heap profiles will be dumped into "/tmp/prof.(pid).0002.heap",
     "/tmp/prof.(pid).0003.heap", and so on.  Nothing happens when this
     function is called without the env.
 
+    Also, this requires the --enable-memory-benchmarking command line flag.
+
     Args:
       process_type: A string which is one of 'browser' or 'renderer'.
       reason: A string which describes the reason for dumping a heap profile.
               The reason will be included in the logged message.
               Examples:
                 'To check memory leaking'
                 'For PyAuto tests'
       tab_index: tab index to work on if 'process_type' == 'renderer'.
           Defaults to 0 (first tab).
       windex: window index to work on if 'process_type' == 'renderer'.
           Defaults to 0 (first window).
 
     Raises:
       pyauto_errors.JSONInterfaceError if the automation call returns an error.
     """
     assert process_type in ('browser', 'renderer')
     if self.IsLinux():  # IsLinux() also implies IsChromeOS().
-      cmd_dict = {
-        'command': 'HeapProfilerDump',
-        'process_type': process_type,
-        'reason': reason,
-        'windex': windex,
-        'tab_index': tab_index,
-      }
-      self._GetResultFromJSONRequest(cmd_dict)
+      js = """
+          if (!chrome.memoryBenchmarking ||
+              !chrome.memoryBenchmarking.isHeapProfilerRunning()) {
+            domAutomationController.send('memory benchmarking disabled');
+          } else {
+            chrome.memoryBenchmarking.heapProfilerDump("%s", "%s");
+            domAutomationController.send('success');
+          }
+      """ % (process_type, reason.replace('"', '\\"'))
+      result = self.ExecuteJavascript(js, tab_index, windex)
+      if result != 'success':
+        raise JSONInterfaceError('Heap profiler dump failed: ' + result)
     else:
       logging.warn('Heap-profiling is not supported in this OS.')
 
   def GetNTPThumbnails(self):
     """Return a list of info about the sites in the NTP most visited section.
     SAMPLE:
       [{ u'title': u'Google',
          u'url': u'http://www.google.com'},
        {
          u'title': u'Yahoo',
@@ skipping 2530 matching lines @@
     successful = result.wasSuccessful()
     if not successful:
       pyauto_tests_file = os.path.join(self.TestsDir(), self._tests_filename)
       print >>sys.stderr, 'Tests can be disabled by editing %s. ' \
                           'Ref: %s' % (pyauto_tests_file, _PYAUTO_DOC_URL)
     sys.exit(not successful)
 
 
 if __name__ == '__main__':
   Main()