Reland of Merge method_counts into resource_sizes

scripts/slave/recipe_modules/chromium_android/example.py

 # Copyright 2014 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.
 
 from recipe_engine.types import freeze
 
 DEPS = [
     'adb',
     'chromium',
     'chromium_android',
@@ skipping 39 matching lines @@
         'adb_vendor_keys': True,
     },
     'perf_runner_allow_high_battery_temp': {
         'perf_config': 'sharded_perf_tests.json',
         'max_battery_temp': 500,
     },
     'gerrit_try_builder': {
         'build': True,
         'skip_wipe': True,
     },
-    'java_method_count_builder': {
-        'build': True,
-        'java_method_count': True,
-    },
     'webview_tester': {
         'remove_system_webview': True,
         'disable_system_chrome': True,
     },
     'slow_tester': {
         'timeout_scale': 2,
     },
     'specific_install_tester': {
         'specific_install': True,
     },
@@ skipping 75 matching lines @@
 
   if config.get('build', False):
     api.chromium.compile()
     api.chromium_android.make_zip_archive('zip_build_proudct', 'archive.zip',
         filters=['*.apk'])
   else:
     api.chromium_android.download_build('build-bucket',
                                               'build_product.zip')
   api.chromium_android.git_number()
 
-  if config.get('java_method_count'):
-    api.chromium_android.java_method_count(
-        api.chromium.output_dir.join('chrome_public_apk', 'classes.dex.zip'))
-
   if config.get('specific_install'):
     api.chromium_android.adb_install_apk('Chrome.apk', devices=['abc123'])
 
   api.adb.root_devices()
   api.chromium_android.spawn_logcat_monitor()
 
   failure = False
   try:
     # TODO(luqui): remove redundant cruft, need one consistent API.
     api.chromium_android.detect_and_setup_devices()
@@ skipping 54 matching lines @@
       'unittests',
       isolate_file_path=api.path['checkout'].join('some_file.isolate'),
       gtest_filter='WebRtc*',
       tool='asan')
   if not failure:
       api.chromium_android.run_bisect_script(extra_src='test.py',
                                              path_to_config='test.py')
 
   if config.get('resource_size'):
     api.chromium_android.resource_sizes(
-        apk_path=api.chromium_android.apk_path('Chrome.apk'),
-        so_path=api.path['checkout'].join(
-            'out', api.chromium.c.BUILD_CONFIG, 'chrome_apk', 'libs',
-            'armeabi-v7a', 'libchrome.so'),
-        so_with_symbols_path=api.path['checkout'].join(
-          'out', api.chromium.c.BUILD_CONFIG, 'lib', 'libchrome.so'),
-        chartjson_file=True)
+        apk_path=api.chromium_android.apk_path('Example.apk'),
+        chartjson_file=True,
+        upload_archives_to_bucket='Bucket')
 
   if config.get('run_webview_cts'):
     api.chromium_android.run_webview_cts(command_line_args=[
         '--webview_arg_1', '--webview_arg_2'])
 
   if config.get('run_telemetry_browser_tests'):
     api.chromium_android.run_telemetry_browser_test('PopularUrlsTest')
 
   api.chromium_android.logcat_dump()
   api.chromium_android.stack_tool_steps()
@@ skipping 184 matching lines @@
          properties_for('tester') +
          api.override_step_data('get version (2)',
              api.raw_io.output('MAJOR=53\nMINOR=0\nBUILD=2800\nPATCH=0\n')))
 
   yield (api.test('telemetry_browser_tests_failures') +
          properties_for('telemetry_browser_tests_tester') +
          api.override_step_data('Run telemetry browser_test PopularUrlsTest',
              api.json.output({'successes': ['passed_test1', 'passed_test2'],
                               'failures': ['failed_test_1', 'failed_test_2']}),
              retcode=1))