Revert of android: Increase NUM_PRIVILEGED_SERVICES to 20 (patchset #3...

Revert of android: Increase NUM_PRIVILEGED_SERVICES to 20 (patchset #3 id:40001 of https://codereview.chromium.org/2555303004/ )

Reason for revert:
Android keeps the intent for a long time, so
randomize doesn't help at all. More details:
crbug.com/664341#c91

Original issue's description:
> android: Increase NUM_PRIVILEGED_SERVICES to 20
>
> This works in conjunction with
> https://codereview.chromium.org/2557273004/ to workaround
> crbug.com/664341. That CL ramdomizes the order of the named services to
> avoid collision, which is not actually effective unless there is a large
> number of named services to choose from.
>
> Sandboxed service already has 20 named services, so up the privileged
> (gpu) count to 20 as well.
>
> BUG=664341
>
> Committed: https://crrev.com/9b853cfcf82d8c57487cb0dd8d1eeaa5ca40260f
> Cr-Commit-Position: refs/heads/master@{#437634}

TBR=tedchoc@chromium.org,halliwell@chromium.org,sanfin@chromium.org,tsunghung@chromium.org
# Not skipping CQ checks because original CL landed more than 1 days ago.
BUG=664341

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

chrome/android/java/AndroidManifest.xml

@@ -847,7 +847,7 @@ by a child template that "extends" this file.
             {{sandboxed_service_extra_flags|default('')}} />
         {% endfor %}
 
-        {% set num_privileged_services = 20 %}
+        {% set num_privileged_services = 3 %}
         <meta-data android:name="org.chromium.content.browser.NUM_PRIVILEGED_SERVICES"
             android:value="{{ num_privileged_services }}"/>
         {% for i in range(num_privileged_services) %}

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

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

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

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

content/public/android/BUILD.gn

@@ -76,23 +76,6 @@ 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/PrivilegedProcessService5.java",
-    "java/src/org/chromium/content/app/PrivilegedProcessService6.java",
-    "java/src/org/chromium/content/app/PrivilegedProcessService7.java",
-    "java/src/org/chromium/content/app/PrivilegedProcessService8.java",
-    "java/src/org/chromium/content/app/PrivilegedProcessService9.java",
-    "java/src/org/chromium/content/app/PrivilegedProcessService10.java",
-    "java/src/org/chromium/content/app/PrivilegedProcessService11.java",
-    "java/src/org/chromium/content/app/PrivilegedProcessService12.java",
-    "java/src/org/chromium/content/app/PrivilegedProcessService13.java",
-    "java/src/org/chromium/content/app/PrivilegedProcessService14.java",
-    "java/src/org/chromium/content/app/PrivilegedProcessService15.java",
-    "java/src/org/chromium/content/app/PrivilegedProcessService16.java",
-    "java/src/org/chromium/content/app/PrivilegedProcessService17.java",
-    "java/src/org/chromium/content/app/PrivilegedProcessService18.java",
-    "java/src/org/chromium/content/app/PrivilegedProcessService19.java",
     "java/src/org/chromium/content/app/SandboxedProcessService.java",
     "java/src/org/chromium/content/app/SandboxedProcessService0.java",
     "java/src/org/chromium/content/app/SandboxedProcessService1.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 privileged process.
+ * more than one sandboxed 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 privileged process.
+ * more than one sandboxed process.
  */
 public class PrivilegedProcessService1 extends PrivilegedProcessService {
 

content/public/android/java/src/org/chromium/content/app/PrivilegedProcessService10.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.content.app;
-
-/**
- * This is needed to register multiple PrivilegedProcess services so that we can have
- * more than one privileged process.
- */
-public class PrivilegedProcessService10 extends PrivilegedProcessService {
-
-}

content/public/android/java/src/org/chromium/content/app/PrivilegedProcessService11.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.content.app;
-
-/**
- * This is needed to register multiple PrivilegedProcess services so that we can have
- * more than one privileged process.
- */
-public class PrivilegedProcessService11 extends PrivilegedProcessService {
-
-}

content/public/android/java/src/org/chromium/content/app/PrivilegedProcessService12.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.content.app;
-
-/**
- * This is needed to register multiple PrivilegedProcess services so that we can have
- * more than one privileged process.
- */
-public class PrivilegedProcessService12 extends PrivilegedProcessService {
-
-}

content/public/android/java/src/org/chromium/content/app/PrivilegedProcessService13.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.content.app;
-
-/**
- * This is needed to register multiple PrivilegedProcess services so that we can have
- * more than one privileged process.
- */
-public class PrivilegedProcessService13 extends PrivilegedProcessService {
-
-}

content/public/android/java/src/org/chromium/content/app/PrivilegedProcessService14.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.content.app;
-
-/**
- * This is needed to register multiple PrivilegedProcess services so that we can have
- * more than one privileged process.
- */
-public class PrivilegedProcessService14 extends PrivilegedProcessService {
-
-}

content/public/android/java/src/org/chromium/content/app/PrivilegedProcessService15.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.content.app;
-
-/**
- * This is needed to register multiple PrivilegedProcess services so that we can have
- * more than one privileged process.
- */
-public class PrivilegedProcessService15 extends PrivilegedProcessService {
-
-}

content/public/android/java/src/org/chromium/content/app/PrivilegedProcessService16.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.content.app;
-
-/**
- * This is needed to register multiple PrivilegedProcess services so that we can have
- * more than one privileged process.
- */
-public class PrivilegedProcessService16 extends PrivilegedProcessService {
-
-}

content/public/android/java/src/org/chromium/content/app/PrivilegedProcessService17.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.content.app;
-
-/**
- * This is needed to register multiple PrivilegedProcess services so that we can have
- * more than one privileged process.
- */
-public class PrivilegedProcessService17 extends PrivilegedProcessService {
-
-}

content/public/android/java/src/org/chromium/content/app/PrivilegedProcessService18.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.content.app;
-
-/**
- * This is needed to register multiple PrivilegedProcess services so that we can have
- * more than one privileged process.
- */
-public class PrivilegedProcessService18 extends PrivilegedProcessService {
-
-}

content/public/android/java/src/org/chromium/content/app/PrivilegedProcessService19.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.content.app;
-
-/**
- * This is needed to register multiple PrivilegedProcess services so that we can have
- * more than one privileged process.
- */
-public class PrivilegedProcessService19 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 privileged process.
+ * more than one sandboxed process.
  */
 public class PrivilegedProcessService2 extends PrivilegedProcessService {
 

content/public/android/java/src/org/chromium/content/app/PrivilegedProcessService3.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.content.app;
-
-/**
- * This is needed to register multiple PrivilegedProcess services so that we can have
- * more than one privileged process.
- */
-public class PrivilegedProcessService3 extends PrivilegedProcessService {
-
-}

content/public/android/java/src/org/chromium/content/app/PrivilegedProcessService4.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.content.app;
-
-/**
- * This is needed to register multiple PrivilegedProcess services so that we can have
- * more than one privileged process.
- */
-public class PrivilegedProcessService4 extends PrivilegedProcessService {
-
-}

content/public/android/java/src/org/chromium/content/app/PrivilegedProcessService5.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.content.app;
-
-/**
- * This is needed to register multiple PrivilegedProcess services so that we can have
- * more than one privileged process.
- */
-public class PrivilegedProcessService5 extends PrivilegedProcessService {
-
-}

content/public/android/java/src/org/chromium/content/app/PrivilegedProcessService6.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.content.app;
-
-/**
- * This is needed to register multiple PrivilegedProcess services so that we can have
- * more than one privileged process.
- */
-public class PrivilegedProcessService6 extends PrivilegedProcessService {
-
-}

content/public/android/java/src/org/chromium/content/app/PrivilegedProcessService7.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.content.app;
-
-/**
- * This is needed to register multiple PrivilegedProcess services so that we can have
- * more than one privileged process.
- */
-public class PrivilegedProcessService7 extends PrivilegedProcessService {
-
-}

content/public/android/java/src/org/chromium/content/app/PrivilegedProcessService8.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.content.app;
-
-/**
- * This is needed to register multiple PrivilegedProcess services so that we can have
- * more than one privileged process.
- */
-public class PrivilegedProcessService8 extends PrivilegedProcessService {
-
-}

content/public/android/java/src/org/chromium/content/app/PrivilegedProcessService9.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.content.app;
-
-/**
- * This is needed to register multiple PrivilegedProcess services so that we can have
- * more than one privileged process.
- */
-public class PrivilegedProcessService9 extends PrivilegedProcessService {
-
-}

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

@@ -48,7 +48,7 @@
                  android:exported="false" />
         {% endfor %}
 
-        {% set num_privileged_services = 20 %}
+        {% set num_privileged_services = 3 %}
         <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 = 20 %}
+        {% set num_privileged_services = 3 %}
         <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

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