Revert of Merge method_counts into resource_sizes

scripts/slave/recipe_modules/chromium_android/api.py

Index: scripts/slave/recipe_modules/chromium_android/api.py
diff --git a/scripts/slave/recipe_modules/chromium_android/api.py b/scripts/slave/recipe_modules/chromium_android/api.py
index 79521692c46248847002669d38b436d39e8aef20..b57839409a63bfa30f0bec95753b650251c2f832 100644
--- a/scripts/slave/recipe_modules/chromium_android/api.py
+++ b/scripts/slave/recipe_modules/chromium_android/api.py
@@ -6,7 +6,6 @@
 import datetime
 import json
 import os
-import pipes
 import re
 import sys
 import urllib
@@ -193,31 +192,35 @@
         **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
-
-  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)]
+    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, 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')
-
-    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)
+      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])
+
+    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(