Hook up LeakCanary to ChromePublic.apk (behind a GN arg)

chrome/android/BUILD.gn

 # 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("//build/config/android/config.gni")
 import("//build/config/android/rules.gni")
 import("//build_overrides/v8.gni")
 import("//chrome/android/chrome_public_apk_tmpl.gni")
 import("//chrome/common/features.gni")
 import("//chrome/version.gni")
 import("//testing/test.gni")
 import("//third_party/icu/config.gni")
 import("//third_party/protobuf/proto_library.gni")
 import("channel.gni")
 
 manifest_package = "org.chromium.chrome"
-if (enable_configuration_policy) {
-  configuration_policy = 1
-} else {
-  configuration_policy = 0
-}
 
-chrome_public_jinja_variables = [
-  "channel=$android_channel",
-  "manifest_package=$manifest_package",
-  "configuration_policy=$configuration_policy",
-]
+chrome_public_jinja_variables = default_chrome_public_jinja_variables +
+                                [ "manifest_package=$manifest_package" ]
 
-chrome_sync_shell_jinja_variables = [
-  "channel=$android_channel",
-  "manifest_package=org.chromium.chrome.sync_shell",
-  "configuration_policy=$configuration_policy",
-]
+chrome_sync_shell_jinja_variables =
+    default_chrome_public_jinja_variables +
+    [ "manifest_package=org.chromium.chrome.sync_shell" ]
 
 chrome_apk_gypi = exec_script("//build/gypi_to_gn.py",
                               [ rebase_path("chrome_apk.gyp") ],
                               "scope",
                               [ "chrome_apk.gyp" ])
 
 chrome_android_paks_gypi =
     exec_script("//build/gypi_to_gn.py",
                 [
                   rebase_path("//chrome/chrome_android_paks.gypi"),
@@ skipping 104 matching lines @@
     "//third_party/android_tools:android_gcm_java",
     "//third_party/android_tools:android_support_v13_java",
     "//third_party/android_tools:android_support_v7_appcompat_java",
     "//third_party/android_tools:android_support_v7_mediarouter_java",
     "//third_party/android_tools:android_support_v7_mediarouter_resources",
     "//third_party/android_tools:android_support_v7_recyclerview_java",
     "//third_party/cacheinvalidation:cacheinvalidation_javalib",
     "//third_party/cacheinvalidation:cacheinvalidation_proto_java",
     "//third_party/gif_player:gif_player_java",
     "//third_party/jsr-305:jsr_305_javalib",
+    "//third_party/leakcanary:leakcanary_java",
     "//ui/android:ui_java",
     "//ui/android:ui_java_resources",
     google_play_services_library,
   ]
 
   srcjar_deps = [
     ":chrome_android_java_enums_srcjar",
     ":chrome_android_java_google_api_keys_srcjar",
     ":chrome_version_srcjar",
     ":resource_id_javagen",
@@ skipping 420 matching lines @@
   apk_name = "ChromeSyncShellTest"
   apk_under_test = ":chrome_sync_shell_apk"
   android_manifest = chrome_sync_shell_test_apk_manifest
   deps = [
     ":chrome_sync_shell_test_apk_java",
     ":chrome_sync_shell_test_apk_manifest",
   ]
   isolate_file = "../chrome_sync_shell_test_apk.isolate"
   proguard_enabled = !is_debug
 }