Remove templating from MonochromeApplication.

There is no longer any need to use a template for MonochromeApplication.
This CL adds a proper MonochromeApplication.java and changes
monochrome_public_apk to use it.

The template code will be removed in a follow-up CL once downstream
targets no longer depend on it.

BUG=698004

Review-Url: https://codereview.chromium.org/2739503002
Cr-Commit-Position: refs/heads/master@{#457425}

chrome/android/BUILD.gn

@@ -753,16 +753,27 @@ chrome_public_apk_tmpl_shared("chrome_modern_public_apk") {
   load_library_from_apk = chromium_linker_supported
 }
 
+android_library("monochrome_java") {
+  deps = [
+    "//android_webview/glue",
+    "//base:base_java",
+    "//chrome/android:chrome_java",
+    "//content/public/android:content_java",
+  ]
+  java_files =
+      [ "java/src/org/chromium/chrome/browser/MonochromeApplication.java" ]
+}
+
 monochrome_public_apk_tmpl("monochrome_public_apk") {
   android_manifest = monochrome_public_android_manifest
   android_manifest_dep = ":monochrome_public_android_manifest"
   apk_name = "MonochromePublic"
 
   deps = [
+    ":monochrome_java",
     "//base:base_java",
     "//chrome/android:app_hooks_java",
     "//chrome/android:chrome_java",
-    "//chrome/android/java/templates:public_monochrome_java",
   ]
 }
 

chrome/android/java/DEPS

@@ -17,3 +17,10 @@ include_rules = [
   "+content/public/android/java",
   "+services/service_manager/public/java",
 ]
+
+specific_include_rules = {
+  # Special-case where monochrome composes chrome+webview
+  "MonochromeApplication\.java": [
+    "+android_webview/glue/java/src/com/android/webview/chromium/MonochromeLibraryPreloader.java",
+  ]
+}

chrome/android/java/src/org/chromium/chrome/browser/MonochromeApplication.java

+// Copyright 2016 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.
+
+package org.chromium.chrome.browser;
+
+import com.android.webview.chromium.MonochromeLibraryPreloader;
+
+import org.chromium.base.library_loader.LibraryLoader;
+import org.chromium.base.library_loader.LibraryProcessType;
+import org.chromium.content.browser.ChildProcessCreationParams;
+
+/**
+ * This is Application class for Monochrome.
+ *
+ * You shouldn't add anything else in this file, this class is split off from
+ * normal chrome in order to access Android system API through Android WebView
+ * glue layer and have monochrome specific code.
+ */
+public class MonochromeApplication extends ChromeApplication {
+    @Override
+    public void onCreate() {
+        super.onCreate();
+        LibraryLoader.setNativeLibraryPreloader(new MonochromeLibraryPreloader());
+        // ChildProcessCreationParams is only needed for browser process, though it is
+        // created and set in all processes.
+        ChildProcessCreationParams.registerDefault(new ChildProcessCreationParams(
+                getPackageName(), true /* isExternalService */, LibraryProcessType.PROCESS_CHILD));
+    }
+}
\ No newline at end of file

chrome/android/java/templates/BUILD.gn

-# Copyright 2016 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("monochrome_application.gni")
-
-monochrome_application = "$target_gen_dir/public_monochrome_application/org/chromium/chrome/browser/MonochromeApplication.java"
-
-generate_monochrome_application("monochrome_application_class") {
-  package = "org.chromium.chrome.browser"
-  super_class = "ChromeApplication"
-  monochrome_application_class = "MonochromeApplication"
-  output = monochrome_application
-}
-
-android_library("public_monochrome_java") {
-  deps = [
-    ":monochrome_application_class",
-    "//android_webview/glue",
-    "//base:base_java",
-    "//chrome/android:app_hooks_java",
-    "//chrome/android:chrome_java",
-    "//content/public/android:content_java",
-  ]
-  java_files = [ monochrome_application ]
-}