Revert of Merge method_counts into resource_sizes

scripts/slave/recipe_modules/chromium_android/api.py

 # 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.
 
 import contextlib
 import datetime
 import json
 import os
-import pipes
 import re
 import sys
 import urllib
 
 from recipe_engine.types import freeze
 from recipe_engine import recipe_api
 
 def _TimestampToIsoFormat(timestamp):
   return datetime.datetime.utcfromtimestamp(timestamp).strftime('%Y%m%dT%H%M%S')
 
@@ skipping 166 matching lines @@
         stdout = self.m.raw_io.output(),
         step_test_data=(
           lambda:
             self.m.raw_io.test_api.stream_output('3000\n')
         ),
         cwd=self.m.path['checkout'],
         infra_step=True,
         **kwargs)
 
   def java_method_count(self, dexfile, name='java_method_count', perf_id=None):
-    # TODO(agrieve): Remove once usages are elimintated.
-    self.resource_sizes(dexfile, perf_id=perf_id)  # pragma: no cover
+    self.m.chromium.runtest(
+        self.m.path['checkout'].join('build', 'android', 'method_count.py'),
+        args=[dexfile],
+        annotate='graphing',
+        results_url='https://chromeperf.appspot.com',
+        perf_id=perf_id or self.m.properties['buildername'],
+        perf_dashboard_id=name,
+        test_type=name)
 
-  def resource_sizes(self, apk_path, chartjson_file=False,
-                     upload_archives_to_bucket=None, perf_id=None):
-    cmd = ['build/android/resource_sizes.py', str(apk_path)]
+  def resource_sizes(self, apk_path, so_path=None, so_with_symbols_path=None,
+                     chartjson_file=False):
+    args=[apk_path, '--build_type', self.m.chromium.c.BUILD_CONFIG]
     if chartjson_file:
-      cmd.append('--chartjson')
+      args.extend(['--chartjson'])
+    if so_path:
+      args.extend(['--so-path', so_path])
+    if so_with_symbols_path:
+      args.extend(['--so-with-symbols-path', so_with_symbols_path])
 
-    config = {
-        'steps': {
-            'resource_sizes': {
-                'cmd': ' '.join(pipes.quote(x) for x in cmd),
-                'device_affinity': None,
-                'archive_output_dir': True
-            }
-        },
-        'version': 1
-    }
-    self.run_sharded_perf_tests(
-        config=self.m.json.input(config),
-        flaky_config=None,
-        perf_id=perf_id or self.m.properties['buildername'],
-        chartjson_file=chartjson_file,
-        upload_archives_to_bucket=upload_archives_to_bucket)
+    self.m.chromium.runtest(
+        self.m.path['checkout'].join('build', 'android', 'resource_sizes.py'),
+        args=args,
+        annotate='graphing',
+        results_url='https://chromeperf.appspot.com',
+        perf_id=self.m.properties['buildername'],
+        perf_dashboard_id='resource_sizes',
+        test_type='resource_sizes',
+        env={'CHROMIUM_OUTPUT_DIR': self.m.chromium.output_dir},
+        chartjson_file=chartjson_file)
 
   def check_webview_licenses(self, name='check licenses'):
     self.m.python(
         name,
         self.m.path['checkout'].join('android_webview',
                                      'tools',
                                      'webview_licenses.py'),
         args=['scan'],
         cwd=self.m.path['checkout'])
 
@@ skipping 1261 matching lines @@
       script = self.c.test_runner
       if wrapper_script_suite_name:
         script = self.m.chromium.output_dir.join('bin', 'run_%s' %
                                                  wrapper_script_suite_name)
       else:
         env = kwargs.get('env', {})
         env['CHROMIUM_OUTPUT_DIR'] = env.get('CHROMIUM_OUTPUT_DIR',
                                              self.m.chromium.output_dir)
         kwargs['env'] = env
       return self.m.python(step_name, script, args, **kwargs)