[Android] Install SystemWebView.apk for SystemWebViewShellLayoutTest.apk.

scripts/slave/recipe_modules/chromium_tests/steps.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.
 
 import re
 import string
 
 
 class Test(object):
   """
@@ skipping 1570 matching lines @@
     },
     'SystemWebViewShellLayoutTest': {
       'compile_target': 'system_webview_shell_layout_test_apk',
       # TODO(agrieve): These should be listed as deps for
       #     system_webview_shell_layout_test_apk.
       'additional_compile_targets': [
         'system_webview_apk',
         'system_webview_shell_apk',
         'android_tools'
       ],
+      # TODO(jbudorick): Remove this once it's handled by the generated script.
+      'additional_apks': [
+        'apks/SystemWebView.apk',
+      ],
     },
     'MojoTest': {
       'compile_target': 'mojo_test_apk',
     }
   }
 
   _DEFAULT_SUITES_BY_TARGET = {
     'android_webview_test_apk': _DEFAULT_SUITES['AndroidWebViewTest'],
     'chrome_public_test_apk': _DEFAULT_SUITES['ChromePublicTest'],
     'chrome_sync_shell_test_apk': _DEFAULT_SUITES['ChromeSyncShellTest'],
@@ skipping 271 matching lines @@
   def run(self, api, suffix, test_filter=None):
     api.chromium_android.coverage_report(upload=False)
     api.chromium_android.get_changed_lines_for_revision()
     api.chromium_android.incremental_coverage_report()
 
 
 GOMA_TESTS = [
   GTestTest('base_unittests'),
   GTestTest('content_unittests'),
 ]