Increase NUM_PRIVILEGED_SERVICES on Android to 5

This is in preparation for running Network Service out of process. The
Network Service process will initially run as a privileged process, so
we need to make sure there are enough services to handle the extra
process.

Bug: 872343
Change-Id: I208c9385a9d48471b2b4ae0b0b23764c18388abc
Merge-With: eureka-internal/210477
Reviewed-on: https://chromium-review.googlesource.com/c/1282122Reviewed-by: Robert Sesek <rsesek@chromium.org>
Reviewed-by: Bo <boliu@chromium.org>
Reviewed-by: Simeon Anfinrud <sanfin@chromium.org>
Reviewed-by: Ted Choc <tedchoc@chromium.org>
Commit-Queue: Clark DuVall <cduvall@chromium.org>
Cr-Commit-Position: refs/heads/master@{#600485}

chrome/android/java/AndroidManifest.xml

@@ -1052,7 +1052,7 @@ by a child template that "extends" this file.
             {% endif %} />
         {% endfor %}
 
-        {% set num_privileged_services = 3 %}
+        {% set num_privileged_services = 5 %}
         <meta-data android:name="org.chromium.content.browser.NUM_PRIVILEGED_SERVICES"
             android:value="{{ num_privileged_services }}"/>
 

chromecast/browser/android/apk/AndroidManifest.xml.jinja2

@@ -46,7 +46,7 @@
                  android:exported="false" />
         {% endfor %}
 
-        {% set num_privileged_services = 3 %}
+        {% set num_privileged_services = 5 %}
         <meta-data android:name="org.chromium.content.browser.NUM_PRIVILEGED_SERVICES"
                    android:value="{{ num_privileged_services }}"/>
 

components/test/android/browsertests_apk/AndroidManifest.xml.jinja2

@@ -49,7 +49,7 @@
                  android:exported="false" />
         {% endfor %}
 
-        {% set num_privileged_services = 3 %}
+        {% set num_privileged_services = 5 %}
         <meta-data android:name="org.chromium.content.browser.NUM_PRIVILEGED_SERVICES"
                    android:value="{{ num_privileged_services }}"/>
 

content/public/android/BUILD.gn

@@ -103,6 +103,8 @@ android_library("content_java") {
     "java/src/org/chromium/content/app/PrivilegedProcessService0.java",
     "java/src/org/chromium/content/app/PrivilegedProcessService1.java",
     "java/src/org/chromium/content/app/PrivilegedProcessService2.java",
+    "java/src/org/chromium/content/app/PrivilegedProcessService3.java",
+    "java/src/org/chromium/content/app/PrivilegedProcessService4.java",
     "java/src/org/chromium/content/app/SandboxedProcessService.java",
     "java/src/org/chromium/content/browser/AppWebMessagePort.java",
     "java/src/org/chromium/content/browser/AudioFocusDelegate.java",

content/public/android/java/src/org/chromium/content/app/PrivilegedProcessService0.java

@@ -6,7 +6,7 @@ package org.chromium.content.app;
 
 /**
  * This is needed to register multiple PrivilegedProcess services so that we can have
- * more than one sandboxed process.
+ * more than one unsandboxed process.
  */
 public class PrivilegedProcessService0 extends PrivilegedProcessService {
 

content/public/android/java/src/org/chromium/content/app/PrivilegedProcessService1.java

@@ -6,7 +6,7 @@ package org.chromium.content.app;
 
 /**
  * This is needed to register multiple PrivilegedProcess services so that we can have
- * more than one sandboxed process.
+ * more than one unsandboxed process.
  */
 public class PrivilegedProcessService1 extends PrivilegedProcessService {
 

content/public/android/java/src/org/chromium/content/app/PrivilegedProcessService2.java

@@ -6,7 +6,7 @@ package org.chromium.content.app;
 
 /**
  * This is needed to register multiple PrivilegedProcess services so that we can have
- * more than one sandboxed process.
+ * more than one unsandboxed process.
  */
 public class PrivilegedProcessService2 extends PrivilegedProcessService {
 

content/public/android/java/src/org/chromium/content/app/PrivilegedProcessService3.java

+// Copyright 2018 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.content.app;
+
+/**
+ * This is needed to register multiple PrivilegedProcess services so that we can have
+ * more than one unsandboxed process.
+ */
+public class PrivilegedProcessService3 extends PrivilegedProcessService {}

content/public/android/java/src/org/chromium/content/app/PrivilegedProcessService4.java

+// Copyright 2018 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.content.app;
+
+/**
+ * This is needed to register multiple PrivilegedProcess services so that we can have
+ * more than one unsandboxed process.
+ */
+public class PrivilegedProcessService4 extends PrivilegedProcessService {}

content/shell/android/browsertests_apk/AndroidManifest.xml.jinja2

@@ -48,7 +48,7 @@
                  android:exported="false" />
         {% endfor %}
 
-        {% set num_privileged_services = 3 %}
+        {% set num_privileged_services = 5 %}
         <meta-data android:name="org.chromium.content.browser.NUM_PRIVILEGED_SERVICES"
                    android:value="{{ num_privileged_services }}"/>
         {% for i in range(num_privileged_services) %}

content/shell/android/linker_test_apk/AndroidManifest.xml.jinja2

@@ -47,7 +47,7 @@
                  android:exported="false" />
         {% endfor %}
 
-        {% set num_privileged_services = 3 %}
+        {% set num_privileged_services = 5 %}
         <meta-data android:name="org.chromium.content.browser.NUM_PRIVILEGED_SERVICES"
                    android:value="{{ num_privileged_services }}"/>
         {% for i in range(num_privileged_services) %}

content/shell/android/shell_apk/AndroidManifest.xml.jinja2

@@ -56,7 +56,7 @@
                  android:exported="false" />
         {% endfor %}
 
-        {% set num_privileged_services = 3 %}
+        {% set num_privileged_services = 5 %}
         <meta-data android:name="org.chromium.content.browser.NUM_PRIVILEGED_SERVICES"
                    android:value="{{ num_privileged_services }}"/>
         {% for i in range(num_privileged_services) %}