Remove deprecated CustomFeedback flow for Android.

It was never launched and there are no plans to ramp it up
past the very, very old experiment.

BUG=913677

Change-Id: I66e22b3f16693a98104dcf56e5bb1dc8ac6fd786
Reviewed-on: https://chromium-review.googlesource.com/c/1372360
Reviewed-by: Jesse Doherty <jwd@chromium.org>
Reviewed-by: Theresa <twellington@chromium.org>
Commit-Queue: Ted Choc <tedchoc@chromium.org>
Cr-Commit-Position: refs/heads/master@{#616911}
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeFeatureList.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeFeatureList.java
index 3b328f0..665487b 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeFeatureList.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeFeatureList.java
@@ -200,7 +200,6 @@
     public static final String CONTEXTUAL_SUGGESTIONS_IPH_REVERSE_SCROLL =
             "ContextualSuggestionsIPHReverseScroll";
     public static final String CUSTOM_CONTEXT_MENU = "CustomContextMenu";
-    public static final String CUSTOM_FEEDBACK_UI = "CustomFeedbackUi";
     public static final String DONT_PREFETCH_LIBRARIES = "DontPrefetchLibraries";
     public static final String DOWNLOAD_HOME_SHOW_STORAGE_INFO = "DownloadHomeShowStorageInfo";
     public static final String DOWNLOAD_PROGRESS_INFOBAR = "DownloadProgressInfoBar";
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index 644fec1..9fa09ff7 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -3078,13 +3078,6 @@
      FEATURE_VALUE_TYPE(omnibox::kDocumentProvider)},
 #endif  // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN)
 
-#if defined(OS_ANDROID)
-    {"enable-custom-feedback-ui",
-     flag_descriptions::kEnableCustomFeedbackUiName,
-     flag_descriptions::kEnableCustomFeedbackUiDescription, kOsAndroid,
-     FEATURE_VALUE_TYPE(chrome::android::kCustomFeedbackUi)},
-#endif  // OS_ANDROID
-
     {"enable-speculative-service-worker-start-on-query-input",
      flag_descriptions::kSpeculativeServiceWorkerStartOnQueryInputName,
      flag_descriptions::kSpeculativeServiceWorkerStartOnQueryInputDescription,
diff --git a/chrome/browser/android/chrome_feature_list.cc b/chrome/browser/android/chrome_feature_list.cc
index 578fa46..edc0fd7 100644
--- a/chrome/browser/android/chrome_feature_list.cc
+++ b/chrome/browser/android/chrome_feature_list.cc
@@ -105,7 +105,6 @@
     &kContextualSearchTapDisableOverride,
     &kContextualSearchUnityIntegration,
     &kCustomContextMenu,
-    &kCustomFeedbackUi,
     &kDontPrefetchLibraries,
     &kDownloadProgressInfoBar,
     &kDownloadHomeV2,
@@ -283,9 +282,6 @@
 const base::Feature kCustomContextMenu{"CustomContextMenu",
                                        base::FEATURE_DISABLED_BY_DEFAULT};
 
-const base::Feature kCustomFeedbackUi{"CustomFeedbackUi",
-                                      base::FEATURE_DISABLED_BY_DEFAULT};
-
 const base::Feature kDontPrefetchLibraries{"DontPrefetchLibraries",
                                            base::FEATURE_DISABLED_BY_DEFAULT};
 
diff --git a/chrome/browser/android/chrome_feature_list.h b/chrome/browser/android/chrome_feature_list.h
index 800442a8..d45aa92 100644
--- a/chrome/browser/android/chrome_feature_list.h
+++ b/chrome/browser/android/chrome_feature_list.h
@@ -41,7 +41,6 @@
 extern const base::Feature kContextualSearchTapDisableOverride;
 extern const base::Feature kContextualSearchUnityIntegration;
 extern const base::Feature kCustomContextMenu;
-extern const base::Feature kCustomFeedbackUi;
 extern const base::Feature kDontPrefetchLibraries;
 extern const base::Feature kDownloadAutoResumptionThrottling;
 extern const base::Feature kDownloadProgressInfoBar;
diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
index f2ebe52..65ac6b1 100644
--- a/chrome/browser/flag_descriptions.cc
+++ b/chrome/browser/flag_descriptions.cc
@@ -2373,11 +2373,6 @@
     "Enables a new context menu when a link, image, or video is pressed within "
     "Chrome.";
 
-const char kEnableCustomFeedbackUiName[] = "Enable Custom Feedback UI";
-const char kEnableCustomFeedbackUiDescription[] =
-    "Enables a custom feedback UI when submitting feedback through Google "
-    "Feedback. Works with Google Play Services v10.2+";
-
 const char kEnableMediaControlsExpandGestureName[] =
     "Enable Media Controls Expand Gesture";
 const char kEnableMediaControlsExpandGestureDescription[] =
diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
index 9a0fdde..ab4fd58 100644
--- a/chrome/browser/flag_descriptions.h
+++ b/chrome/browser/flag_descriptions.h
@@ -1419,9 +1419,6 @@
 extern const char kEnableCustomContextMenuName[];
 extern const char kEnableCustomContextMenuDescription[];
 
-extern const char kEnableCustomFeedbackUiName[];
-extern const char kEnableCustomFeedbackUiDescription[];
-
 extern const char kEnableMediaControlsExpandGestureName[];
 extern const char kEnableMediaControlsExpandGestureDescription[];
 
diff --git a/testing/variations/fieldtrial_testing_config.json b/testing/variations/fieldtrial_testing_config.json
index bc74988..059d119 100644
--- a/testing/variations/fieldtrial_testing_config.json
+++ b/testing/variations/fieldtrial_testing_config.json
@@ -1414,21 +1414,6 @@
             ]
         }
     ],
-    "CustomFeedbackUi": [
-        {
-            "platforms": [
-                "android"
-            ],
-            "experiments": [
-                {
-                    "name": "Enabled",
-                    "enable_features": [
-                        "CustomFeedbackUi"
-                    ]
-                }
-            ]
-        }
-    ],
     "DataCompressionProxyLoFi": [
         {
             "platforms": [
diff --git a/tools/metrics/actions/actions.xml b/tools/metrics/actions/actions.xml
index ee603aa..c3be860 100644
--- a/tools/metrics/actions/actions.xml
+++ b/tools/metrics/actions/actions.xml
@@ -11188,6 +11188,10 @@
 </action>
 
 <action name="MobileCustomFeedback">
+  <obsolete>
+    Deprecated 12/2018. CustomFeedback never shipped to 100% and is no longer
+    planned for launch.
+  </obsolete>
   <owner>wychen@chromium.org</owner>
   <description>Custom Feedback dialog is shown.</description>
 </action>
diff --git a/tools/metrics/histograms/enums.xml b/tools/metrics/histograms/enums.xml
index 028fafb..b943b1f 100644
--- a/tools/metrics/histograms/enums.xml
+++ b/tools/metrics/histograms/enums.xml
@@ -839,6 +839,10 @@
 </enum>
 
 <enum name="AndroidFeedbackCategory">
+  <obsolete>
+    Deprecated 12/2018. CustomFeedback never shipped to 100% and is no longer
+    planned for launch.
+  </obsolete>
   <summary>
     This list corresponds to the categories the user can press when selecting a
     category their feedback falls under.
@@ -850,6 +854,10 @@
 </enum>
 
 <enum name="AndroidFeedbackCategoryDetails">
+  <obsolete>
+    Deprecated 12/2018. CustomFeedback never shipped to 100% and is no longer
+    planned for launch.
+  </obsolete>
   <summary>
     This list corresponds to all the possible options a user can press when
     selecting an option their feedback falls under. Each option is prefixed with
diff --git a/tools/metrics/histograms/histograms.xml b/tools/metrics/histograms/histograms.xml
index fa49f9b..1d15f16 100644
--- a/tools/metrics/histograms/histograms.xml
+++ b/tools/metrics/histograms/histograms.xml
@@ -1591,6 +1591,10 @@
 
 <histogram name="Android.CustomFeedback.Category"
     enum="AndroidFeedbackCategory">
+  <obsolete>
+    Deprecated 12/2018. CustomFeedback never shipped to 100% and is no longer
+    planned for launch.
+  </obsolete>
   <owner>jwanda@chromium.org</owner>
   <summary>
     Recorded when the user selects a category button when in the Custom Feedback
@@ -1600,6 +1604,10 @@
 
 <histogram name="Android.CustomFeedback.CategoryDetails"
     enum="AndroidFeedbackCategoryDetails">
+  <obsolete>
+    Deprecated 12/2018. CustomFeedback never shipped to 100% and is no longer
+    planned for launch.
+  </obsolete>
   <owner>jwanda@chromium.org</owner>
   <summary>
     Recorded when a user selects an option related to their problem within the