Move ContentFeatureList to content_public

This CL will doesn't change any functionality. It will allow a follow-up
CL to use ContentFeatureList without adding dependency.

Change-Id: Iad7584f4eef86d666c1ecc7e4a85da8e6028288e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1904081Reviewed-by: Bo <boliu@chromium.org>
Commit-Queue: François Beaufort <beaufort.francois@gmail.com>
Cr-Commit-Position: refs/heads/master@{#714215}

content/browser/android/content_feature_list.cc

@@ -7,7 +7,7 @@
 #include "base/android/jni_string.h"
 #include "base/feature_list.h"
 #include "base/stl_util.h"
-#include "content/public/android/content_jni_headers/ContentFeatureList_jni.h"
+#include "content/public/android/content_jni_headers/ContentFeatureListImpl_jni.h"
 #include "content/public/common/content_features.h"
 
 using base::android::ConvertJavaStringToUTF8;
@@ -42,7 +42,7 @@ const base::Feature* FindFeatureExposedToJava(const std::string& feature_name) {
 const base::Feature kServiceGroupImportance{"ServiceGroupImportance",
                                             base::FEATURE_DISABLED_BY_DEFAULT};
 
-static jboolean JNI_ContentFeatureList_IsEnabled(
+static jboolean JNI_ContentFeatureListImpl_IsEnabled(
     JNIEnv* env,
     const JavaParamRef<jstring>& jfeature_name) {
   const base::Feature* feature =

content/public/android/BUILD.gn

@@ -130,7 +130,7 @@ android_library("content_java") {
     "java/src/org/chromium/content/browser/ContentApiHelperForM.java",
     "java/src/org/chromium/content/browser/ContentChildProcessConstants.java",
     "java/src/org/chromium/content/browser/ContentClassFactory.java",
-    "java/src/org/chromium/content/browser/ContentFeatureList.java",
+    "java/src/org/chromium/content/browser/ContentFeatureListImpl.java",
     "java/src/org/chromium/content/browser/ContentNfcDelegate.java",
     "java/src/org/chromium/content/browser/ContentUiEventHandler.java",
     "java/src/org/chromium/content/browser/ContentViewStaticsImpl.java",
@@ -247,6 +247,7 @@ android_library("content_java") {
     "java/src/org/chromium/content_public/browser/ActionModeCallbackHelper.java",
     "java/src/org/chromium/content_public/browser/BrowserStartupController.java",
     "java/src/org/chromium/content_public/browser/BrowserTaskExecutor.java",
+    "java/src/org/chromium/content_public/browser/ContentFeatureList.java",
     "java/src/org/chromium/content_public/browser/ContentViewStatics.java",
     "java/src/org/chromium/content_public/browser/DeviceUtils.java",
     "java/src/org/chromium/content_public/browser/InputMethodManagerWrapper.java",
@@ -400,7 +401,7 @@ generate_jni("content_jni_headers") {
     "java/src/org/chromium/content/browser/BrowserStartupControllerImpl.java",
     "java/src/org/chromium/content/browser/ChildProcessLauncherHelperImpl.java",
     "java/src/org/chromium/content/browser/ContactsDialogHost.java",
-    "java/src/org/chromium/content/browser/ContentFeatureList.java",
+    "java/src/org/chromium/content/browser/ContentFeatureListImpl.java",
     "java/src/org/chromium/content/browser/ContentNfcDelegate.java",
     "java/src/org/chromium/content/browser/ContentUiEventHandler.java",
     "java/src/org/chromium/content/browser/ContentViewStaticsImpl.java",

content/public/android/java/src/org/chromium/content/browser/ChildProcessLauncherHelperImpl.java

@@ -244,7 +244,8 @@ public final class ChildProcessLauncherHelperImpl {
         if (!sCheckedFeatures) {
             sCheckedFeatures = true;
             if (sSandboxedChildConnectionRanking != null
-                    && ContentFeatureList.isEnabled(ContentFeatureList.SERVICE_GROUP_IMPORTANCE)) {
+                    && ContentFeatureListImpl.isEnabled(
+                            ContentFeatureListImpl.SERVICE_GROUP_IMPORTANCE)) {
                 sSandboxedChildConnectionRanking.enableServiceGroupImportance();
             }
         }
@@ -504,8 +505,8 @@ public final class ChildProcessLauncherHelperImpl {
             boostForPendingViews = false;
         }
 
-        boolean mediaRendererHasModerate = ContentFeatureList.isEnabled(
-                ContentFeatureList.BACKGROUND_MEDIA_RENDERER_HAS_MODERATE_BINDING);
+        boolean mediaRendererHasModerate = ContentFeatureListImpl.isEnabled(
+                ContentFeatureListImpl.BACKGROUND_MEDIA_RENDERER_HAS_MODERATE_BINDING);
 
         @ChildProcessImportance
         int newEffectiveImportance;

content/public/android/java/src/org/chromium/content/browser/ContentFeatureList.java → content/public/android/java/src/org/chromium/content/browser/ContentFeatureListImpl.java

-// Copyright 2017 The Chromium Authors. All rights reserved.
+// Copyright 2019 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.
 
@@ -9,14 +9,12 @@ import org.chromium.base.annotations.MainDex;
 import org.chromium.base.annotations.NativeMethods;
 
 /**
+ * Implementation of {@link ContentFeatureList}.
  * Java accessor for base/feature_list.h state.
  */
 @JNINamespace("content::android")
 @MainDex
-public abstract class ContentFeatureList {
-    // Prevent instantiation.
-    private ContentFeatureList() {}
-
+public class ContentFeatureListImpl {
     /**
      * Returns whether the specified feature is enabled or not.
      *
@@ -27,7 +25,7 @@ public abstract class ContentFeatureList {
      * @return Whether the feature is enabled or not.
      */
     public static boolean isEnabled(String featureName) {
-        return ContentFeatureListJni.get().isEnabled(featureName);
+        return ContentFeatureListImplJni.get().isEnabled(featureName);
     }
 
     // Alphabetical:

content/public/android/java/src/org/chromium/content_public/browser/ContentFeatureList.java

+// Copyright 2019 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_public.browser;
+
+import org.chromium.content.browser.ContentFeatureListImpl;
+
+/**
+ * Static public methods for ContentFeatureList.
+ */
+public class ContentFeatureList {
+    private ContentFeatureList() {}
+
+    /**
+     * Returns whether the specified feature is enabled or not.
+     *
+     * @param featureName The name of the feature to query.
+     * @return Whether the feature is enabled or not.
+     */
+    public static boolean isEnabled(String featureName) {
+        return ContentFeatureListImpl.isEnabled(featureName);
+    }
+}